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

Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-09-26 17:42:48 +00:00
committed by Android (Google) Code Review
parent 3aabfca462 7d3b6b4703
commit 3c3ceb9d42
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.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);
}
}
}