diff options
author | Daniel Sandler <dsandler@android.com> | 2012-11-08 09:28:13 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 09:28:14 -0800 |
commit | 4eada64770bc2f021cb04cbb77efbad1c9a7adc4 (patch) | |
tree | 2855cb60c3b5b9892012398a2e57f09ad7ca6038 | |
parent | 14adfe425e67c9ec12b0841a62c5c03ce00838ea (diff) | |
parent | 6ed3fcafdbdeda9a10a62bbd0e5997017e8e2635 (diff) | |
download | base-4eada64770bc2f021cb04cbb77efbad1c9a7adc4.tar.gz |
Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java | 10 | ||||
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java | 15 |
2 files changed, 12 insertions, 13 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java index 7ce0544d9446..4c19caacb50e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java @@ -151,9 +151,19 @@ public abstract class KeyguardActivityLauncher { boolean useDefaultAnimations, final Handler worker, final Runnable onStarted) { + final Context context = getContext(); final Bundle animation = useDefaultAnimations ? null : ActivityOptions.makeCustomAnimation(context, 0, 0).toBundle(); + launchActivityWithAnimation(intent, showsWhileLocked, animation, worker, onStarted); + } + + public void launchActivityWithAnimation(final Intent intent, + boolean showsWhileLocked, + final Bundle animation, + final Handler worker, + final Runnable onStarted) { + LockPatternUtils lockPatternUtils = getLockPatternUtils(); intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 211560215830..964537c6941a 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -1501,19 +1501,8 @@ public class KeyguardHostView extends KeyguardViewBase { getHandler(), null); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - setOnDismissAction(new OnDismissAction() { - @Override - public boolean onDismiss() { - try { - mContext.startActivityAsUser(intent, opts.toBundle(), - new UserHandle(UserHandle.USER_CURRENT)); - } catch (ActivityNotFoundException e) { - Slog.w(TAG, "Activity not found for " + intent.getAction()); - } - return false; - } - }); - mViewStateManager.showBouncer(true); + mActivityLauncher.launchActivityWithAnimation( + intent, false, opts.toBundle(), null, null); } } |