From 1dedd16208b2d3d759264e730f135c3ab94bdac4 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 11 Nov 2022 11:36:25 -0800 Subject: [PATCH] [User Switcher] Remove duplicate views. Ensures that there are no duplicate views for full screen user switcher. Check the children for the grid container view instead of the root view as the root view is not a direct parent of the user views. Fixes: 257544527 Test: Open full screen user switcher. Using the power button, turn the screen off and back on. Change-Id: I32ae88550dc2d7e29acda08e2e9360c8590c5954 --- .../android/systemui/user/ui/binder/UserSwitcherViewBinder.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt b/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt index ad09ee3c10d99..e13710786fbb7 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt @@ -133,7 +133,9 @@ object UserSwitcherViewBinder { launch { viewModel.users.collect { users -> val viewPool = - view.children.filter { it.tag == USER_VIEW_TAG }.toMutableList() + gridContainerView.children + .filter { it.tag == USER_VIEW_TAG } + .toMutableList() viewPool.forEach { gridContainerView.removeView(it) flowWidget.removeView(it)