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

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

Browse Source
This commit is contained in:
Charles Chiu
2022-06-29 07:25:35 +00:00
committed by Android (Google) Code Review
parent a1919e4b2d 8a5d120d73
commit bfc1787139
2 changed files with 3 additions and 2 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,7 +95,9 @@ class UserSwitchDialogController @VisibleForTesting constructor(
getButton(BUTTON_NEUTRAL) getButton(BUTTON_NEUTRAL)
) )
dismiss() if (controller == null) {
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,7 +139,6 @@ 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(