Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aaron Liu
2022-06-28 16:32:24 +00:00
committed by Android (Google) Code Review
parent fac74db147 cbbef45daf
commit 3f06dfbe17
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,9 +95,7 @@ class UserSwitchDialogController @VisibleForTesting constructor(
getButton(BUTTON_NEUTRAL) getButton(BUTTON_NEUTRAL)
) )
if (controller == null) { dismiss()
dismiss()
}
activityStarter.postStartActivityDismissingKeyguard( activityStarter.postStartActivityDismissingKeyguard(
USER_SETTINGS_INTENT, 0, controller USER_SETTINGS_INTENT, 0, controller

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

@@ -139,6 +139,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() {
`when`(dialog.getButton(DialogInterface.BUTTON_NEUTRAL)).thenReturn(neutralButton) `when`(dialog.getButton(DialogInterface.BUTTON_NEUTRAL)).thenReturn(neutralButton)
clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL) clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL)
verify(dialog).dismiss()
verify(activityStarter) verify(activityStarter)
.postStartActivityDismissingKeyguard( .postStartActivityDismissingKeyguard(