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

Commit 507b3a7b authored by Danesh M's avatar Danesh M Committed by Gerrit Code Review
Browse files

SystemUI : Ensure bouncer is not shown for SHADE 

When dismissing the notification panel, bouncer should only
be shown if you are in SHADE_LOCKED or KEYGUARD.

CYNGNOS-2810

Change-Id: Ia9c6f3198fe785ba8d19e10962caa92a5cea3f23
parent 6ce16de7

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

+4 −8
Original line number Diff line number Diff line
@@ -4683,7 +4683,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    public void showBouncer() {

        if (!mRecreating && mNotificationPanel.mCanDismissKeyguard) {

        if (!mRecreating && mNotificationPanel.mCanDismissKeyguard

                && (mState != StatusBarState.SHADE || mLiveLockScreenController.getLiveLockScreenHasFocus())) {

            // ensure external keyguard view does not have focus

            unfocusKeyguardExternalView();

            mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
@@ -4789,15 +4790,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    public void onTrackingStopped(boolean expand) {

        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED ||

                mLiveLockScreenController.getLiveLockScreenHasFocus()) {

            if (!expand && (!mUnlockMethodCache.canSkipBouncer() ||

                    mLiveLockScreenController.isShowingLiveLockScreenView())) {

        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {

            if (!expand && !mUnlockMethodCache.canSkipBouncer()) {

                showBouncer();

            }

        } else if (expand && mStatusBarWindowManager.keyguardExternalViewHasFocus()) {

            mStatusBarKeyguardViewManager.setKeyguardExternalViewFocus(false);

            setBarState(StatusBarState.KEYGUARD);

        }

    }