Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a62f92 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

Merge "WakeAndUnlock: Make sure blanking is never animated" into oc-dr1-dev am: cbab3edc am: 3bc413bc
am: dca692c6

Change-Id: Iedbfb1ad4bd901fed5bcb87412c75670e781de4d
parents aa6ee67d dca692c6

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);