From 7d3b6b4703e3fa280437bb5ac311af6482484449 Mon Sep 17 00:00:00 2001 From: Alexandra Gherghina Date: Mon, 22 Sep 2014 10:16:06 +0100 Subject: [PATCH] Use plain user icon in UserSpinnerAdapter Before, we were using CircleFramedDrawable, used by user settings. That performs some alterations on the image (adds an outline and shadow) that made it inconsistent with the corp icon. Bug: 17561925 Change-Id: I2490360d332a1b93864858122868b571f2949617 --- src/com/android/settings/UserSpinnerAdapter.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/UserSpinnerAdapter.java b/src/com/android/settings/UserSpinnerAdapter.java index b44caacbe40..001dfc460c3 100644 --- a/src/com/android/settings/UserSpinnerAdapter.java +++ b/src/com/android/settings/UserSpinnerAdapter.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.pm.UserInfo; import android.content.res.Resources; import android.database.DataSetObserver; -import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; @@ -32,8 +32,6 @@ import android.widget.SpinnerAdapter; import android.widget.TextView; import com.android.internal.util.UserIcons; -import com.android.settings.drawable.CircleFramedDrawable; -import com.android.settings.R; import java.util.ArrayList; @@ -54,14 +52,14 @@ public class UserSpinnerAdapter implements SpinnerAdapter { if (userInfo.isManagedProfile()) { name = context.getString(R.string.managed_user_title); icon = Resources.getSystem().getDrawable( - com.android.internal.R.drawable.ic_corp_icon); + com.android.internal.R.drawable.ic_corp_icon); } else { name = userInfo.name; - Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier()); - if (bitmap != null) { - icon = CircleFramedDrawable.getInstance(context, bitmap); + final int userId = userInfo.id; + if (um.getUserIcon(userId) != null) { + icon = new BitmapDrawable(context.getResources(), um.getUserIcon(userId)); } else { - icon = UserIcons.getDefaultUserIcon(userInfo.id, /* light= */ false); + icon = UserIcons.getDefaultUserIcon(userId, /* light= */ false); } } }