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

Commit 09f1464d authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Don't skip setting scrim alpha when unlocked" into main

parents ecf0dc14 5856165c

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

+2 −1
Original line number Diff line number Diff line
@@ -733,7 +733,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 


        if (mPanelExpansionFraction != panelExpansionFraction) {

            if (panelExpansionFraction != 0f

                    && mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()) {

                    && mKeyguardUnlockAnimationController.isPlayingCannedUnlockAnimation()

                    && mState != ScrimState.UNLOCKED) {

                mAnimatingPanelExpansionOnUnlock = true;

            } else if (panelExpansionFraction == 0f) {

                mAnimatingPanelExpansionOnUnlock = false;