commit | 5ade4db7037beef50410da6c06f0b8dacd298e18 | [log] [tgz] |
---|---|---|
author | Chandru S <chandruis@google.com> | Fri Oct 18 17:13:10 2024 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 18 17:13:10 2024 +0000 |
tree | 9de737af6d82d4d7661bfcfd973d0ac5c9c6a8c0 | |
parent | 1ab80dd06d8c9685378a74d66465916d71bd756f [diff] | |
parent | 1868ad36b821e39551e7488a80d9ee2d4fea596d [diff] |
Merge "Fix icon resource loading issue for user switcher" into main
diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerSceneContentViewModel.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerSceneContentViewModel.kt index 0bcb58d..5f97391 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerSceneContentViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/BouncerSceneContentViewModel.kt
@@ -175,8 +175,10 @@ actions.map { action -> UserSwitcherDropdownItemViewModel( icon = - Icon.Resource( - action.iconResourceId, + Icon.Loaded( + applicationContext.resources.getDrawable( + action.iconResourceId + ), contentDescription = null, ), text = Text.Resource(action.textResourceId),