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

Commit 89e7eed9 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Avoid showing bouncer when in a launch transition" into pi-dev 

am: a102591e

Change-Id: I0f3e3be4e7bbd931f8b2ae122276c707f20c153b
parents 255c3b66 a102591e

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                || mStatusBar.isFullScreenUserSwitcherState()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        } else if (mShowing && !mDozing) {

            if (!isWakeAndUnlocking()) {

            if (!isWakeAndUnlocking() && !mStatusBar.isInLaunchTransition()) {

                mBouncer.setExpansion(expansion);

            }

            if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking

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

+8 −0
Original line number Diff line number Diff line
@@ -177,6 +177,14 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mBouncer, never()).setExpansion(anyFloat());

    }



    @Test

    public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() {

        when(mStatusBar.isInLaunchTransition()).thenReturn(true);

        mStatusBarKeyguardViewManager.onPanelExpansionChanged(KeyguardBouncer.EXPANSION_VISIBLE,

                false /* tracking */);

        verify(mBouncer, never()).setExpansion(anyFloat());

    }



    private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {



        public TestableStatusBarKeyguardViewManager(Context context,