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

Commit c516bac0 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Simplify scrimmed bouncer condition 

Similar logic existed in StatusBar and StatusBarKeyguardViewManager,
this can lead to errors since it's easy to update one place and forget
about the other.

Test: go/sysui-bouncer-tests
Test: force simPin security mode
Change-Id: I4a22cba5144844cf982f259da13db0c8effbeae6
parent 7f6641b8

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

+2 −4
Original line number Diff line number Diff line
@@ -4722,10 +4722,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
            // Bouncer needs the front scrim when it's on top of an activity,

            // tapping on a notification, editing QS or being dismissed by

            // FLAG_DISMISS_KEYGUARD_ACTIVITY.

            ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

                    || mStatusBarKeyguardViewManager.willDismissWithAction()

                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?

                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

            ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()

                    ? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

            mScrimController.transitionTo(state);

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

            mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

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

+3 −7
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        // • Full-screen user switcher is displayed.

        if (mNotificationPanelView.isUnlockHintRunning()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);

        } else if (mOccluded || mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed()

                || mStatusBar.isFullScreenUserSwitcherState()) {

        } else if (bouncerNeedsScrimming()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        } else if (mShowing && !mDozing) {

            if (!isWakeAndUnlocking()) {
@@ -731,12 +730,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        }

    }



    public boolean willDismissWithAction() {

        return mBouncer.willDismissWithAction();

    }



    public boolean bouncerNeedsScrimming() {

        return mBouncer.isShowingScrimmed();

        return mOccluded || mBouncer.willDismissWithAction()  || mBouncer.needsFullscreenBouncer()

                || mStatusBar.isFullScreenUserSwitcherState() || mBouncer.isShowingScrimmed();

    }



    public void dump(PrintWriter pw) {