Make default user icons retrievable as cached bitmaps
Also invoke that method where formerly we did a UserIcon.convertBitmap( UserIcon.getDefaultUserIcon(...)) call. Bug: 19620707 Change-Id: I2ae3bbcee7d1c6515f0f6253925ef9837d8e3548
This commit is contained in:
@@ -872,8 +872,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
for (int userId : values[0]) {
|
||||
Bitmap bitmap = mUserManager.getUserIcon(userId);
|
||||
if (bitmap == null) {
|
||||
bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(userId,
|
||||
/* light= */ false));
|
||||
bitmap = Utils.getDefaultUserIconAsBitmap(userId);
|
||||
}
|
||||
mUserIcons.append(userId, bitmap);
|
||||
}
|
||||
@@ -889,15 +888,13 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
}
|
||||
|
||||
private void assignDefaultPhoto(UserInfo user) {
|
||||
Bitmap bitmap = UserIcons.convertToBitmap(UserIcons.getDefaultUserIcon(user.id,
|
||||
/* light= */ false));
|
||||
Bitmap bitmap = Utils.getDefaultUserIconAsBitmap(user.id);
|
||||
mUserManager.setUserIcon(user.id, bitmap);
|
||||
}
|
||||
|
||||
private Drawable getEncircledDefaultIcon() {
|
||||
if (mDefaultIconDrawable == null) {
|
||||
mDefaultIconDrawable = encircle(UserIcons.convertToBitmap(
|
||||
UserIcons.getDefaultUserIcon(UserHandle.USER_NULL, /* light= */ false)));
|
||||
mDefaultIconDrawable = encircle(Utils.getDefaultUserIconAsBitmap(UserHandle.USER_NULL));
|
||||
}
|
||||
return mDefaultIconDrawable;
|
||||
}
|
||||
|
Reference in New Issue
Block a user