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

Commit ea377526 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Show scrims when bouncer is on top of QS" into pi-dev am: fa9eef64 

am: a86ff247

Change-Id: I6d1fe025fdeb09c848c551bb8bc3ab68494135c1
parents 1025bbdd a86ff247

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

+3 −2
Original line number Diff line number Diff line
@@ -4624,8 +4624,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                != FingerprintUnlockController.MODE_UNLOCK);



        if (mBouncerShowing) {

            mScrimController.transitionTo(

                    mIsOccluded ? ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER);

            final boolean qsExpanded = mQSPanel != null && mQSPanel.isExpanded();

            mScrimController.transitionTo(mIsOccluded || qsExpanded ?

                    ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER);

        } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) {

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

        } else if (mBrightnessMirrorVisible) {