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

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

Merge "Clear leave shade open on bouncer exit" into main

parents d06abbd4 17975c5e

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

+7 −0
Original line number Diff line number Diff line
@@ -803,6 +803,13 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mPrimaryBouncerInteractor).setDismissAction(eq(null), eq(null));

    }



    @Test

    public void onBackPressedResetsLeaveOnKeyguardHide() {

        when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true);

        mStatusBarKeyguardViewManager.onBackPressed();

        verify(mStatusBarStateController).setLeaveOpenOnKeyguardHide(false);

    }



    @Test

    public void testResetHideBouncerWhenShowingIsFalse_alternateBouncerHides() {

        // GIVEN the keyguard is showing

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

+1 −0
Original line number Diff line number Diff line
@@ -1348,6 +1348,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        if (!canHandleBackPressed()) {

            return;

        }

        mStatusBarStateController.setLeaveOpenOnKeyguardHide(false);



        boolean hideBouncerOverDream = isBouncerShowing()

                && mDreamOverlayStateController.isOverlayActive();