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

Commit fa9eef64 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

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

parents bf4f1795 ae861e8e

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