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

Commit 5f4a5276 authored Jun 28, 2022 by Aaron Liu Committed by Automerger Merge Worker Jun 28, 2022

Merge "[User Switcher] Dismiss dialog when launch" into tm-qpr-dev am: 3f06dfbe am: 00b4510a

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

Change-Id: Ia7e1d095c4748b67ca030deabd23b7c5f229f4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 29173f1d 00b4510a

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

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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(