Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8239e5bb authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia3d9ac1d9df26e8202c93c0ace55ceb5fb187f20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94bf9d70 4ed76021

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -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 = {