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

Commit 24256992 authored by Sanry Huang's avatar Sanry Huang Committed by android-build-merger
Browse files

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

am: 5e019b5f

Change-Id: I162486ac973bc59d22b400261f15a233ab67e718
parents 4c607463 5e019b5f

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();