From fba4ef0b4e08d178e4b8602075360ddefb271edf Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Wed, 25 Jan 2023 09:33:04 -0800
Subject: [PATCH] Crop avatar in bouncer user switcher

Crop the avatar into a circle in the bouncer user switcher.

Fixes: 263314352
Test: upload photo for bouncer user switcher and open bouncer.
Change-Id: I0a966cfe68a8a18663808aa6bda8baf418f80ae0
---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index e4f85db3971e2..74255805ee035 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -92,6 +92,7 @@ import com.android.internal.util.UserIcons;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.settingslib.Utils;
+import com.android.settingslib.drawable.CircleFramedDrawable;
 import com.android.systemui.Gefingerpoken;
 import com.android.systemui.R;
 import com.android.systemui.animation.Interpolators;
@@ -998,8 +999,10 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
         private Drawable findUserIcon(int userId) {
             Bitmap userIcon = UserManager.get(mView.getContext()).getUserIcon(userId);
             if (userIcon != null) {
-                return new BitmapDrawable(userIcon);
+                return CircleFramedDrawable.getInstance(mView.getContext(),
+                        userIcon);
             }
+
             return UserIcons.getDefaultUserIcon(mResources, userId, false);
         }