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

am: cbab3edc3e Change-Id: I49d8dc5f8cdd470064c9450e6722a905a4d1b0ed
2017-07-31 16:48:44 +00:00
parent 9fadf818c6 cbab3edc3e
commit 3bc413bca8
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);