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

Commit 4a1e4df7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "PreDraw scrim on AOD -> UNLOCKED"

parents e277b9a5 e93b87f1

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

+3 −1
Original line number Diff line number Diff line
@@ -370,13 +370,15 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        if (mKeyguardUpdateMonitor.needsSlowUnlockTransition() && mState == ScrimState.UNLOCKED) {

            mAnimationDelay = StatusBar.FADE_KEYGUARD_START_DELAY;

            scheduleUpdate();

        } else if ((!mDozeParameters.getAlwaysOn() && oldState == ScrimState.AOD)

        } else if ((oldState == ScrimState.AOD  // leaving doze

                && (!mDozeParameters.getAlwaysOn() || mState == ScrimState.UNLOCKED))

                || (mState == ScrimState.AOD && !mDozeParameters.getDisplayNeedsBlanking())) {

            // Scheduling a frame isn't enough when:

            //  • Leaving doze and we need to modify scrim color immediately

            //  • ColorFade will not kick-in and scrim cannot wait for pre-draw.

            onPreDraw();

        } else {

            // Schedule a frame

            scheduleUpdate();

        }