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

Merge "Fix user avatar not being set on rotation"

Browse Source
This commit is contained in:
João Victor Mendes Freire
2022-12-07 13:49:32 +00:00
committed by Android (Google) Code Review
parent d97f27b816 8b14ffb876
commit 16a10ba0a1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/UserSettings.java
View File

@@ -1021,6 +1021,8 @@ public class UserSettings extends SettingsPreferenceFragment
@VisibleForTesting @VisibleForTesting
void createUser(final int userType, String userName) { void createUser(final int userType, String userName) {
Context context = getContext(); Context context = getContext();
Resources resources = getResources();
final Drawable selectedUserIcon = mPendingUserIcon;
Future<?> unusedCreateUserFuture = ThreadUtils.postOnBackgroundThread(() -> { Future<?> unusedCreateUserFuture = ThreadUtils.postOnBackgroundThread(() -> {
UserInfo user; UserInfo user;
@@ -1043,13 +1045,13 @@ public class UserSettings extends SettingsPreferenceFragment
} }
Future<?> unusedSettingIconFuture = ThreadUtils.postOnBackgroundThread(() -> { Future<?> unusedSettingIconFuture = ThreadUtils.postOnBackgroundThread(() -> {
Drawable newUserIcon = mPendingUserIcon; Drawable newUserIcon = selectedUserIcon;
if (newUserIcon == null) { if (newUserIcon == null) {
newUserIcon = UserIcons.getDefaultUserIcon(getResources(), user.id, false); newUserIcon = UserIcons.getDefaultUserIcon(resources, user.id, false);
} }
mUserManager.setUserIcon( mUserManager.setUserIcon(
user.id, UserIcons.convertToBitmapAtUserIconSize( user.id, UserIcons.convertToBitmapAtUserIconSize(
getResources(), newUserIcon)); resources, newUserIcon));
}); });
mPendingUserIcon = null; mPendingUserIcon = null;