diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-02 22:21:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 22:21:05 -0700 |
| commit | 2fa8cf7360c7c1ad309fe878355426a6e161af5b (patch) | |
| tree | 99d7cd78d380a3e8e693c3bbc9e275585ab04ce2 /src | |
| parent | b0e25f71a8376c6435212a3ce695f321d0ea828e (diff) | |
| parent | 95dc4733c0462c89453e444f1e3474bee442b868 (diff) | |
| download | packages_apps_settings-2fa8cf7360c7c1ad309fe878355426a6e161af5b.zip packages_apps_settings-2fa8cf7360c7c1ad309fe878355426a6e161af5b.tar.gz packages_apps_settings-2fa8cf7360c7c1ad309fe878355426a6e161af5b.tar.bz2 | |
Merge "Use new color avatar assets" into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index bcc70bd..984ac08 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -91,12 +91,14 @@ public class UserSettings extends SettingsPreferenceFragment "key_add_user_long_message_displayed"; private static final int[] USER_DRAWABLES = { - R.drawable.ic_user_orange, - R.drawable.ic_user_cyan, - R.drawable.ic_user_green, - R.drawable.ic_user_purple, - R.drawable.ic_user_red, - R.drawable.ic_user_yellow + R.drawable.avatar_default_1, + R.drawable.avatar_default_2, + R.drawable.avatar_default_3, + R.drawable.avatar_default_4, + R.drawable.avatar_default_5, + R.drawable.avatar_default_6, + R.drawable.avatar_default_7, + R.drawable.avatar_default_8 }; private PreferenceGroup mUserListCategory; @@ -450,7 +452,7 @@ public class UserSettings extends SettingsPreferenceFragment if (user.iconPath != null) { if (mUserIcons.get(user.id) == null) { missingIcons.add(user.id); - pref.setIcon(R.drawable.ic_user); + pref.setIcon(R.drawable.avatar_default_1); } else { setPhotoId(pref, user); } @@ -463,7 +465,7 @@ public class UserSettings extends SettingsPreferenceFragment pref.setEnabled(false); pref.setTitle(R.string.user_new_user_name); pref.setSummary(R.string.user_adding_new_user); - pref.setIcon(R.drawable.ic_user); + pref.setIcon(R.drawable.avatar_default_1); mUserListCategory.addPreference(pref); } getActivity().invalidateOptionsMenu(); |