Merge "Fixes user switcher dialog animations." (61e599ea) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -204,15 +204,6 @@ public class UserDetailView extends PseudoGridView {
	Trace.endSection();		Trace.endSection();
	}		}

	@Override
	public void onUserListItemClicked(@NonNull UserRecord record,
	@Nullable UserSwitchDialogController.DialogShower dialogShower) {
	if (dialogShower != null) {
	mDialogShower.dismiss();
	}
	super.onUserListItemClicked(record, dialogShower);
	}

	public void linkToViewGroup(ViewGroup viewGroup) {		public void linkToViewGroup(ViewGroup viewGroup) {
	PseudoGridView.ViewGroupAdapterBridge.link(viewGroup, this);		PseudoGridView.ViewGroupAdapterBridge.link(viewGroup, this);
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseUserSwitcherAdapter.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ protected constructor(
	* animation to and from the parent dialog.		* animation to and from the parent dialog.
	*/		*/
	@JvmOverloads		@JvmOverloads
	open fun onUserListItemClicked(		fun onUserListItemClicked(
	record: UserRecord,		record: UserRecord,
	dialogShower: DialogShower? = null,		dialogShower: DialogShower? = null,
	) {		) {

packages/SystemUI/src/com/android/systemui/user/domain/interactor/UserInteractor.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -455,6 +455,7 @@ constructor(
	}		}
	UserActionModel.ADD_SUPERVISED_USER -> {		UserActionModel.ADD_SUPERVISED_USER -> {
	uiEventLogger.log(MultiUserActionsEvent.CREATE_RESTRICTED_USER_FROM_USER_SWITCHER)		uiEventLogger.log(MultiUserActionsEvent.CREATE_RESTRICTED_USER_FROM_USER_SWITCHER)
			dismissDialog()
	activityStarter.startActivity(		activityStarter.startActivity(
	Intent()		Intent()
	.setAction(UserManager.ACTION_CREATE_SUPERVISED_USER)		.setAction(UserManager.ACTION_CREATE_SUPERVISED_USER)

packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -66,12 +66,6 @@ constructor(
	private fun startHandlingDialogShowRequests() {		private fun startHandlingDialogShowRequests() {
	applicationScope.get().launch {		applicationScope.get().launch {
	interactor.get().dialogShowRequests.filterNotNull().collect { request ->		interactor.get().dialogShowRequests.filterNotNull().collect { request ->
	currentDialog?.let {
	if (it.isShowing) {
	it.cancel()
	}
	}

	val (dialog, dialogCuj) =		val (dialog, dialogCuj) =
	when (request) {		when (request) {
	is ShowDialogRequestModel.ShowAddUserDialog ->		is ShowDialogRequestModel.ShowAddUserDialog ->

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UserDetailViewAdapterTest.kt

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ import com.android.systemui.R
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.classifier.FalsingManagerFake		import com.android.systemui.classifier.FalsingManagerFake
	import com.android.systemui.qs.QSUserSwitcherEvent		import com.android.systemui.qs.QSUserSwitcherEvent
	import com.android.systemui.qs.user.UserSwitchDialogController
	import com.android.systemui.statusbar.policy.UserSwitcherController		import com.android.systemui.statusbar.policy.UserSwitcherController
	import com.android.systemui.user.data.source.UserRecord		import com.android.systemui.user.data.source.UserRecord
	import org.junit.Assert.assertEquals		import org.junit.Assert.assertEquals
	@@ -42,7 +41,6 @@ import org.mockito.ArgumentMatchers.any
	import org.mockito.ArgumentMatchers.anyBoolean		import org.mockito.ArgumentMatchers.anyBoolean
	import org.mockito.ArgumentMatchers.anyInt		import org.mockito.ArgumentMatchers.anyInt
	import org.mockito.Mock		import org.mockito.Mock
	import org.mockito.Mockito.mock
	import org.mockito.Mockito.verify		import org.mockito.Mockito.verify
	import org.mockito.Mockito.`when`		import org.mockito.Mockito.`when`
	import org.mockito.MockitoAnnotations		import org.mockito.MockitoAnnotations
	@@ -152,15 +150,6 @@ class UserDetailViewAdapterTest : SysuiTestCase() {
	assertNull(adapter.users.find { it.isManageUsers })		assertNull(adapter.users.find { it.isManageUsers })
	}		}

	@Test
	fun clickDismissDialog() {
	val shower: UserSwitchDialogController.DialogShower =
	mock(UserSwitchDialogController.DialogShower::class.java)
	adapter.injectDialogShower(shower)
	adapter.onUserListItemClicked(createUserRecord(current = true, guest = false), shower)
	verify(shower).dismiss()
	}

	private fun createUserRecord(current: Boolean, guest: Boolean) =		private fun createUserRecord(current: Boolean, guest: Boolean) =
	UserRecord(		UserRecord(
	UserInfo(0 /* id /, "name", 0 / flags */),		UserInfo(0 /* id /, "name", 0 / flags */),