diff options
| author | Danesh M <danesh@cyngn.com> | 2016-05-17 10:11:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-17 19:04:42 -0700 |
| commit | 507b3a7b6699ee6c4fb759d6a46396adc198af31 (patch) | |
| tree | 403d10ab9314da5c300cf7a4e852007c0d21cb1c /packages/SystemUI | |
| parent | 6ce16de71d5915fe3401701801e59795ce3707d0 (diff) | |
| download | frameworks_base-507b3a7b6699ee6c4fb759d6a46396adc198af31.zip frameworks_base-507b3a7b6699ee6c4fb759d6a46396adc198af31.tar.gz frameworks_base-507b3a7b6699ee6c4fb759d6a46396adc198af31.tar.bz2 | |
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
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 597fa7c..87acad4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -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); } } |