diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 314700907f57..3913254aab23 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -201,7 +201,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb */ public void reset(boolean hideBouncerWhenShowing) { if (mShowing) { - if (mOccluded) { + if (mOccluded && !mDozing) { mStatusBar.hideKeyguard(); mStatusBar.stopWaitingForKeyguardExit(); mBouncer.hide(false /* destroyView */); @@ -294,9 +294,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } mStatusBarWindowManager.setKeyguardOccluded(occluded); - // If Keyguard is reshown, don't hide the bouncer as it might just have been requested by - // a FLAG_DISMISS_KEYGUARD_ACTIVITY. - reset(false /* hideBouncerWhenShowing*/); + // setDozing(false) will call reset once we stop dozing. + if (!mDozing) { + // If Keyguard is reshown, don't hide the bouncer as it might just have been requested + // by a FLAG_DISMISS_KEYGUARD_ACTIVITY. + reset(false /* hideBouncerWhenShowing*/); + } if (animate && !occluded && mShowing) { mStatusBar.animateKeyguardUnoccluding(); } |