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

Commit 5e019b5f authored by Sanry Huang's avatar Sanry Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix notification bar can be dragged when SIM PIN lock screen." into pi-dev

parents 3e180afa 42cae96f

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

+2 −1
Original line number Diff line number Diff line
@@ -4683,7 +4683,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
            // tapping on a notification, editing QS or being dismissed by

            // FLAG_DISMISS_KEYGUARD_ACTIVITY.

            ScrimState state = mIsOccluded || mNotificationPanel.needsScrimming()

                    || mStatusBarKeyguardViewManager.willDismissWithAction() ?

                    || mStatusBarKeyguardViewManager.willDismissWithAction()

                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?

                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

            mScrimController.transitionTo(state);

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

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

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        return mBouncer.isShowing();

    }



    public boolean isFullscreenBouncer() {

        return mBouncer.isFullscreenBouncer();

    }



    private long getNavBarShowDelay() {

        if (mStatusBar.isKeyguardFadingAway()) {

            return mStatusBar.getKeyguardFadingAwayDelay();