From c2e6868f2c6b275403437987489b34faeb279ac9 Mon Sep 17 00:00:00 2001 From: Dave Mankoff Date: Tue, 29 Jun 2021 16:45:08 -0400 Subject: [PATCH] Fix Bouncer-Showing Status. Prior this change, if you drag up slowly on the lock screen, (no password/pin), it will mark the bouncer as showing because it thought the bouncher "would" show. The Bouncer never actually shows, however, so we get stuck in that state. With this change, we ensure that the bouncer is never marked as showing in that scenario. This fixes an unexpected visual artifact where the sim-pin error messsage would show on top of HUNs because it was left visible when the Bouncer was marked as showing. Fixes: 191733743 Test: manual Change-Id: Ia2e7dc72ca57ae932cb58e99410daffc9e7c0672 --- .../com/android/systemui/statusbar/phone/KeyguardBouncer.java | 4 ++++ .../statusbar/phone/StatusBarKeyguardViewManager.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index b5e550a470228..d6ea4a828395c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -367,6 +367,10 @@ public class KeyguardBouncer { return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE; } + public boolean getShowingSoon() { + return mShowingSoon; + } + /** * @return {@code true} when bouncer's pre-hide animation already started but isn't completely * hidden yet, {@code false} otherwise. 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 e8463992ed135..0b6884bcdfa49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -857,7 +857,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb @Override public boolean bouncerIsOrWillBeShowing() { - return mBouncer.isShowing() || mBouncer.inTransit(); + return mBouncer.isShowing() || mBouncer.getShowingSoon(); } public boolean isFullscreenBouncer() {