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

Commit 3f06dfbe authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[User Switcher] Dismiss dialog when launch" into tm-qpr-dev

parents fac74db1 cbbef45d

packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt

+1 −3
Original line number Diff line number Diff line
@@ -95,9 +95,7 @@ class UserSwitchDialogController @VisibleForTesting constructor( 
                        getButton(BUTTON_NEUTRAL)

                    )



                    if (controller == null) {

                    dismiss()

                    }



                    activityStarter.postStartActivityDismissingKeyguard(

                        USER_SETTINGS_INTENT, 0, controller

packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { 
        `when`(dialog.getButton(DialogInterface.BUTTON_NEUTRAL)).thenReturn(neutralButton)



        clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL)

        verify(dialog).dismiss()



        verify(activityStarter)

            .postStartActivityDismissingKeyguard(