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

Commit 90170d06 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Bouncer isn't in transit when fully visible/hidden" into qt-r1-dev 

am: c2877e11

Change-Id: I970034070ea3b0f6b9191f832526983f5de8e247
parents dd4e8b94 c2877e11

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

+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;

    }



    /**

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java

+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();

    }

}