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

Merge "Set user icon to default when updating profile without photo" into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-04-15 02:18:10 +00:00
committed by Android (Google) Code Review
parent cdb089c96d 71caf698b4
commit 2cae2f1613
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,7 +331,8 @@ public class UserSettings extends SettingsPreferenceFragment
protected String doInBackground(Void... values) {
UserInfo user = mUserManager.getUserInfo(UserHandle.myUserId());
if (user.iconPath == null || user.iconPath.equals("")) {
assignProfilePhoto(user);
// Assign profile photo.
Utils.copyMeProfilePhoto(getActivity(), user);
}
return user.name;
}
@@ -404,14 +405,14 @@ public class UserSettings extends SettingsPreferenceFragment
private UserInfo createRestrictedProfile() {
UserInfo newUserInfo = mUserManager.createRestrictedProfile(mAddingUserName);
assignDefaultPhoto(newUserInfo);
Utils.assignDefaultPhoto(getActivity(), newUserInfo.id);
return newUserInfo;
}
private UserInfo createTrustedUser() {
UserInfo newUserInfo = mUserManager.createUser(mAddingUserName, 0);
if (newUserInfo != null) {
assignDefaultPhoto(newUserInfo);
Utils.assignDefaultPhoto(getActivity(), newUserInfo.id);
}
return newUserInfo;
}
@@ -898,17 +899,6 @@ public class UserSettings extends SettingsPreferenceFragment
}.execute(missingIcons);
}
private void assignProfilePhoto(final UserInfo user) {
if (!Utils.copyMeProfilePhoto(getActivity(), user)) {
assignDefaultPhoto(user);
}
}
private void assignDefaultPhoto(UserInfo user) {
Bitmap bitmap = Utils.getDefaultUserIconAsBitmap(user.id);
mUserManager.setUserIcon(user.id, bitmap);
}
private Drawable getEncircledDefaultIcon() {
if (mDefaultIconDrawable == null) {
mDefaultIconDrawable = encircle(Utils.getDefaultUserIconAsBitmap(UserHandle.USER_NULL));