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

Commit 702c3a31 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Crop avatar in bouncer user switcher" into tm-qpr-dev am: 9547fef8 

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



Change-Id: I54d2d33d91f588c2a3e746256d7f0b87afe057cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d280afc8 9547fef8

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+4 −1
Original line number Diff line number Diff line
@@ -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;
@@ -999,8 +1000,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);

        }