Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes user switcher name and icon regressions." into tm-qpr-dev am: 4ed760213f

Browse Source 
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>
This commit is contained in:
Ale Nijamkin
2022-10-14 20:46:56 +00:00
committed by Automerger Merge Worker
parent 94bf9d70b0 4ed760213f
commit 8239e5bbd1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt
View File

@@ -20,6 +20,7 @@ package com.android.systemui.user.ui.viewmodel
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.android.systemui.R 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.common.ui.drawable.CircularDrawable
import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.FeatureFlags
import com.android.systemui.flags.Flags import com.android.systemui.flags.Flags
@@ -161,7 +162,12 @@ private constructor(
): UserViewModel { ): UserViewModel {
return UserViewModel( return UserViewModel(
viewKey = model.id, 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), image = CircularDrawable(model.image),
isSelectionMarkerVisible = model.isSelected, isSelectionMarkerVisible = model.isSelected,
alpha = alpha =
@@ -187,6 +193,7 @@ private constructor(
isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER, isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER,
isAddUser = model == UserActionModel.ADD_USER, isAddUser = model == UserActionModel.ADD_USER,
isGuest = model == UserActionModel.ENTER_GUEST_MODE, isGuest = model == UserActionModel.ENTER_GUEST_MODE,
isTablet = true,
) )
}, },
textResourceId = textResourceId =
@@ -199,6 +206,7 @@ private constructor(
isGuestUserResetting = guestUserInteractor.isGuestUserResetting, isGuestUserResetting = guestUserInteractor.isGuestUserResetting,
isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER, isAddSupervisedUser = model == UserActionModel.ADD_SUPERVISED_USER,
isAddUser = model == UserActionModel.ADD_USER, isAddUser = model == UserActionModel.ADD_USER,
isTablet = true,
) )
}, },
onClicked = { onClicked = {