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 am: 3f06dfbe17

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

Change-Id: Ia48b78aa21602758bdf0764662a32f1d8eeaee88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-06-28 16:37:22 +00:00
committed by Automerger Merge Worker
parent cd68df4851 3f06dfbe17
commit 00b4510a73
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)
)
if (controller == null) {
dismiss()
}
dismiss()
activityStarter.postStartActivityDismissingKeyguard(
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)
clickCaptor.value.onClick(dialog, DialogInterface.BUTTON_NEUTRAL)
verify(dialog).dismiss()
verify(activityStarter)
.postStartActivityDismissingKeyguard(