PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use plain user icon in UserSpinnerAdapter

Browse Source 
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
This commit is contained in:
Alexandra Gherghina
2014-09-22 10:16:06 +01:00
parent 3156e38f5e
commit 7d3b6b4703
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/UserSpinnerAdapter.java
View File

@@ -20,7 +20,7 @@ import android.content.Context;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.DataSetObserver; import android.database.DataSetObserver;
import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -32,8 +32,6 @@ import android.widget.SpinnerAdapter;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.util.UserIcons; import com.android.internal.util.UserIcons;
import com.android.settings.drawable.CircleFramedDrawable;
import com.android.settings.R;
import java.util.ArrayList; import java.util.ArrayList;
@@ -54,14 +52,14 @@ public class UserSpinnerAdapter implements SpinnerAdapter {
if (userInfo.isManagedProfile()) { if (userInfo.isManagedProfile()) {
name = context.getString(R.string.managed_user_title); name = context.getString(R.string.managed_user_title);
icon = Resources.getSystem().getDrawable( icon = Resources.getSystem().getDrawable(
com.android.internal.R.drawable.ic_corp_icon); com.android.internal.R.drawable.ic_corp_icon);
} else { } else {
name = userInfo.name; name = userInfo.name;
Bitmap bitmap = um.getUserIcon(userHandle.getIdentifier()); final int userId = userInfo.id;
if (bitmap != null) { if (um.getUserIcon(userId) != null) {
icon = CircleFramedDrawable.getInstance(context, bitmap); icon = new BitmapDrawable(context.getResources(), um.getUserIcon(userId));
} else { } else {
icon = UserIcons.getDefaultUserIcon(userInfo.id, /* light= */ false); icon = UserIcons.getDefaultUserIcon(userId, /* light= */ false);
} }
} }
} }