Skip to content

Commit 507b3a7

Browse files
DaneshGerrit Code Review
authored andcommitted
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
1 parent 6ce16de commit 507b3a7

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4683,7 +4683,8 @@ public boolean onSpacePressed() {
46834683
}
46844684

46854685
public void showBouncer() {
4686-
if (!mRecreating && mNotificationPanel.mCanDismissKeyguard) {
4686+
if (!mRecreating && mNotificationPanel.mCanDismissKeyguard
4687+
&& (mState != StatusBarState.SHADE || mLiveLockScreenController.getLiveLockScreenHasFocus())) {
46874688
// ensure external keyguard view does not have focus
46884689
unfocusKeyguardExternalView();
46894690
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
@@ -4789,15 +4790,10 @@ public void onLeftHintStarted(String hint) {
47894790
}
47904791

47914792
public void onTrackingStopped(boolean expand) {
4792-
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED ||
4793-
mLiveLockScreenController.getLiveLockScreenHasFocus()) {
4794-
if (!expand && (!mUnlockMethodCache.canSkipBouncer() ||
4795-
mLiveLockScreenController.isShowingLiveLockScreenView())) {
4793+
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
4794+
if (!expand && !mUnlockMethodCache.canSkipBouncer()) {
47964795
showBouncer();
47974796
}
4798-
} else if (expand && mStatusBarWindowManager.keyguardExternalViewHasFocus()) {
4799-
mStatusBarKeyguardViewManager.setKeyguardExternalViewFocus(false);
4800-
setBarState(StatusBarState.KEYGUARD);
48014797
}
48024798
}
48034799

0 commit comments

Comments
 (0)