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

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

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

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 = {