Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 273832d6 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

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
parent 4c507046
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ public class KeyguardBouncer {
     * {@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;
    }

    /**
+11 −0
Original line number Diff line number Diff line
@@ -394,4 +394,15 @@ public class KeyguardBouncerTest extends SysuiTestCase {
    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();
    }
}