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

Commit 557775c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent bouncer from showing during unlock animation" into udc-dev

parents 1fe8b30f a3c06300

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

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


        return mKeyguardStateController.isShowing()

                && !primaryBouncerIsOrWillBeShowing()

                && !mKeyguardStateController.isKeyguardGoingAway()

                && isUserTrackingStarted

                && !hideBouncerOverDream

                && !mKeyguardStateController.isOccluded()

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

+11 −0
Original line number Diff line number Diff line
@@ -351,6 +351,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());

    }



    @Test

    public void onPanelExpansionChanged_neverTranslatesBouncerWhenGoingAway() {

        when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);

        mStatusBarKeyguardViewManager.onPanelExpansionChanged(

                expansionEvent(

                        /* fraction= */ EXPANSION_VISIBLE,

                        /* expanded= */ true,

                        /* tracking= */ false));

        verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());

    }



    @Test

    public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() {

        // Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing