diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 0b3d0f7160f0..595b3cd3ad2e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -2334,6 +2334,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, Log.e(TAG, "doKeyguard: we're still showing, but going away. Re-show the " + "keyguard rather than short-circuiting and resetting."); } else { + // We're removing "reset" in the refactor - "resetting" the views will happen + // as a reaction to the root cause of the "reset" signal. + if (KeyguardWmStateRefactor.isEnabled()) { + return; + } + // It's already showing, and we're not trying to show it while the screen is // off. We can simply reset all of the views, but don't hide the bouncer in case // the user is currently interacting with it. 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 2d775b74eb32..57e7dc74a24d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -965,7 +965,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (isOccluded && !mDozing) { mCentralSurfaces.hideKeyguard(); if (hideBouncerWhenShowing || needsFullscreenBouncer()) { - hideBouncer(false /* destroyView */); + // We're removing "reset" in the refactor - bouncer will be hidden by the root + // cause of the "reset" calls. + if (!KeyguardWmStateRefactor.isEnabled()) { + hideBouncer(false /* destroyView */); + } } } else { showBouncerOrKeyguard(hideBouncerWhenShowing); |