Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev

am: cbab3edc3e Change-Id: Ibd62f5942fd09e0c1ec846db0595c76d0ad822be
2017-07-31 16:48:34 +00:00
parent a30ec5ff4c cbab3edc3e
commit 0cd8a31c12
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -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);