diff options
author | Amith Yamasani <yamasani@google.com> | 2014-08-11 17:17:29 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2014-08-11 17:17:29 -0700 |
commit | f2663abe1da11107104162a098482f34bb9fea03 (patch) | |
tree | 51130410fffd66ceda5d87b139baf00ac6a83edb /src/com/android/settings/users | |
parent | dc16286ff32dfc4d087938461d0beca29b6167a3 (diff) | |
download | packages_apps_Settings-f2663abe1da11107104162a098482f34bb9fea03.zip packages_apps_Settings-f2663abe1da11107104162a098482f34bb9fea03.tar.gz packages_apps_Settings-f2663abe1da11107104162a098482f34bb9fea03.tar.bz2 |
Allow creating last user even if a guest exists.
Bug: 15934700
Also fix missing icon when user has no icon.
Change-Id: I07c76043df9cda8aeccecb09289d570845dc4560
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r-- | src/com/android/settings/users/UserSettings.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 7dc83ef..aa5ec38 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -794,6 +794,8 @@ public class UserSettings extends SettingsPreferenceFragment } else { setPhotoId(pref, user); } + } else { + pref.setIcon(getEncircledDefaultAvatar()); } } @@ -825,7 +827,7 @@ public class UserSettings extends SettingsPreferenceFragment if (missingIcons.size() > 0) { loadIconsAsync(missingIcons); } - boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size(); + boolean moreUsers = mUserManager.canAddMoreUsers(); mAddUser.setEnabled(moreUsers); } @@ -841,6 +843,9 @@ public class UserSettings extends SettingsPreferenceFragment protected Void doInBackground(List<Integer>... values) { for (int userId : values[0]) { Bitmap bitmap = mUserManager.getUserIcon(userId); + if (bitmap == null) { + bitmap = createBitmapFromDrawable(R.drawable.ic_avatar_default_1); + } mUserIcons.append(userId, bitmap); } return null; |