Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev (4eada647) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -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

+2 −13

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}