diff options
| author | 2022-10-14 20:46:56 +0000 | |
|---|---|---|
| committer | 2022-10-14 20:46:56 +0000 | |
| commit | 8239e5bbd16eb747a3ec4b3c7a5bf09d6e24cf03 (patch) | |
| tree | 74f3ff81a229de13d1d67997396dc56b0be90c9d | |
| parent | 94bf9d70b05c56a4b7f245fbea55348180dff20a (diff) | |
| parent | 4ed760213f3236bd35192e746ec7e54cc89cd423 (diff) | |
Merge "Fixes user switcher name and icon regressions." into tm-qpr-dev am: 4ed760213f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20196996
Change-Id: Ia3d9ac1d9df26e8202c93c0ace55ceb5fb187f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt b/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt index 91cd12dde3a3..9c588532f34a 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt @@ -20,6 +20,7 @@ package com.android.systemui.user.ui.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.android.systemui.R +import com.android.systemui.common.shared.model.Text import com.android.systemui.common.ui.drawable.CircularDrawable import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags @@ -161,7 +162,12 @@ private constructor( ): UserViewModel { return UserViewModel( viewKey = model.id, - name = model.name, + name = + if (model.isGuest) { + Text.Resource(com.android.settingslib.R.string.guest_exit_quick_settings_button) + } else { + model.name + }, image = CircularDrawable(model.image), isSelectionMarkerVisible = model.isSelected, alpha = @@ -187,6 +193,7 @@ private constructor( isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER, isAddUser = model == UserActionModel.ADD_USER, isGuest = model == UserActionModel.ENTER_GUEST_MODE, + isTablet = true, ) }, textResourceId = @@ -199,6 +206,7 @@ private constructor( isGuestUserResetting = guestUserInteractor.isGuestUserResetting, isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER, isAddUser = model == UserActionModel.ADD_USER, + isTablet = true, ) }, onClicked = { |