| commit | 273832d6acb2eb9a5cb49c07484f4ca3a3b75493 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Jul 23 13:44:12 2019 -0700 |
| committer | Lucas Dupin <dupin@google.com> | Tue Jul 23 14:39:46 2019 -0700 |
| tree | 3d8a52a23a11dfa05041a338f5618183fb6e9e4a | |
| parent | 4c50704670996bd8c25f9fcce281997c66ba9750 [diff] |
Bouncer isn't in transit when fully visible/hidden Test: atest KeyguardBouncerTest Test: tap screen when unlocking without bypass mode Fixes: 138125943 Change-Id: I9d2b58aebf42fc0d3ff3e39e97cb8734b3bbed71
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 98704de6..40085a4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -349,7 +349,7 @@ * {@link #show(boolean)} was called but we're not showing yet, or being dragged. */ public boolean inTransit() { - return mShowingSoon || mExpansion != EXPANSION_HIDDEN; + return mShowingSoon || mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE; } /**
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java index 852271a..907e695 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
@@ -394,4 +394,15 @@ public void testRegisterUpdateMonitorCallback() { verify(mKeyguardUpdateMonitor).registerCallback(any()); } + + @Test + public void testInTransit_whenTranslation() { + mBouncer.show(true); + mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN); + assertThat(mBouncer.inTransit()).isFalse(); + mBouncer.setExpansion(0.5f); + assertThat(mBouncer.inTransit()).isTrue(); + mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); + assertThat(mBouncer.inTransit()).isFalse(); + } }