Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev (0cd8a31c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -379,7 +379,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
		setScrimBehindAlpha(0f);
		} else if (mWakeAndUnlocking) {
		// During wake and unlock, we first hide everything behind a black scrim, which then
		// gets faded out from animateKeyguardFadingOut.
		// gets faded out from animateKeyguardFadingOut. This must never be animated.
		mAnimateChange = false;
		if (mDozing) {
		setScrimInFrontAlpha(0f);
		setScrimBehindAlpha(1f);