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

Commit 27ce7f77 authored by Charles Chiu's avatar Charles Chiu Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "[User Switcher] Dismiss dialog when launch"" into tm-qpr-dev am: bfc17871 am: f2848ae1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101101



Change-Id: Ib8153427145373a2c61250a58f64b7f46001da88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e550ef7f f2848ae1

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

+3 −1
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ 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

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



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

        verify(dialog).dismiss()



        verify(activityStarter)

            .postStartActivityDismissingKeyguard(