commit b7d3274126612395f29dd620cc1bc21d41164134
author Lucas Dupin <dupin@google.com> Fri Jul 12 17:46:11 2019 +0900
committer Lucas Dupin <dupin@google.com> Fri Jul 12 17:46:11 2019 +0900
tree 3f08c22a681dfea8d2c118f17f99dd02fdc6a6ca
parent 74a075348105a53ee1dc62cc16f1c070db2a25fb

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

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 21a22ec..d6f8a60 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 @@
     }
 
     /**
-     * {@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;
     }
 
     /**

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

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 20bc2a7..da85039 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 @@
      * animation didn't finish yet.
      */
     public boolean bouncerIsOrWillBeShowing() {
-        return mBouncer.isShowing() || mBouncer.willShowSoon();
+        return mBouncer.isShowing() || mBouncer.inTransit();
     }
 
     public boolean isFullscreenBouncer() {