From b7d3274126612395f29dd620cc1bc21d41164134 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Fri, 12 Jul 2019 17:46:11 +0900 Subject: [PATCH] Fix issue where bouncer won't be dismissed when being dragged Because the animation might have finished but bouncer is not fully visible yet. Test: start dragging, wait for animation, then auth with face Fixes: 132846921 Change-Id: I0155d0ddffb628c94c9d427826f54995bc9b3671 --- .../android/systemui/statusbar/phone/KeyguardBouncer.java | 6 +++--- .../statusbar/phone/StatusBarKeyguardViewManager.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 21a22eccf5096..d6f8a606af55d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -346,10 +346,10 @@ public class KeyguardBouncer { } /** - * {@link #show(boolean)} was called but we're not showing yet. + * {@link #show(boolean)} was called but we're not showing yet, or being dragged. */ - public boolean willShowSoon() { - return mShowingSoon; + public boolean inTransit() { + return mShowingSoon || mExpansion != EXPANSION_HIDDEN; } /** 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 20bc2a742de62..da85039039f24 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -719,7 +719,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb * animation didn't finish yet. */ public boolean bouncerIsOrWillBeShowing() { - return mBouncer.isShowing() || mBouncer.willShowSoon(); + return mBouncer.isShowing() || mBouncer.inTransit(); } public boolean isFullscreenBouncer() {