From cbbef45daf98f0b783984c2270b836dd5aaab806 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 24 Jun 2022 10:04:24 -0700 Subject: [User Switcher] Dismiss dialog when launch Dismiss dialog when launching bouncer for settings. Test: Added a case in unit test and manual on device Bug: 234030654 Change-Id: I8f28e9d0422259e74c0a192aa2942e2a1e1d5bc5 --- .../src/com/android/systemui/qs/user/UserSwitchDialogController.kt | 4 +--- .../com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt index 260a3714a368..75bf18953bf1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt @@ -95,9 +95,7 @@ class UserSwitchDialogController @VisibleForTesting constructor( getButton(BUTTON_NEUTRAL) ) - if (controller == null) { - dismiss() - } + dismiss() activityStarter.postStartActivityDismissingKeyguard( USER_SETTINGS_INTENT, 0, controller diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt index 9d908fdfb976..aad03e25de60 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt @@ -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( -- cgit v1.2.3-59-g8ed1b