Fix launcher flash during secure camera transition. (6e36f101) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -118,8 +118,7 @@ public abstract class KeyguardActivityLauncher {
		public void launchActivity(final Intent intent, boolean showsWhileLocked, boolean animate) {
		final Context context = getContext();
		final Bundle animation = animate ? null :
		ActivityOptions.makeCustomAnimation(context, com.android.internal.R.anim.fade_in,
		com.android.internal.R.anim.fade_out).toBundle();
		ActivityOptions.makeCustomAnimation(context, 0, 0).toBundle();
		LockPatternUtils lockPatternUtils = getLockPatternUtils();
		intent.addFlags(
		Intent.FLAG_ACTIVITY_NEW_TASK

+2 −2

Original line number	Diff line number	Diff line
		@@ -824,7 +824,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		public void onLaunchingCamera() {
		SlidingChallengeLayout slider = locateSlider();
		if (slider != null) {
		slider.showHandle(false);
		slider.setHandleAlpha(0);
		}
		}

		@@ -835,7 +835,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		}
		SlidingChallengeLayout slider = locateSlider();
		if (slider != null) {
		slider.showHandle(true);
		slider.setHandleAlpha(1);
		slider.showChallenge(true);
		}
		}

+3 −10

Original line number	Diff line number	Diff line
		@@ -270,16 +270,9 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout
		setWillNotDraw(false);
		}

		public void showHandle(boolean visible) {
		if (visible) {
		if (mHandleAnimation != null) {
		mHandleAnimation.cancel();
		mHandleAnimation = null;
		}
		mHandleAlpha = 1.f;
		invalidate();
		} else {
		animateHandle(false);
		public void setHandleAlpha(float alpha) {
		if (mExpandChallengeView != null) {
		mExpandChallengeView.setAlpha(alpha);
		}
		}