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

am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

Browse Source 
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter
This commit is contained in:
Alexandra Gherghina
2014-09-26 19:55:27 +00:00
committed by Android Git Automerger
parent 0c74ea6cc5 3c3ceb9d42
commit c7611429e9
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);
} }
} }
} }