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

Merge "Use new color avatar assets" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-02 22:21:05 -07:00
committed by Android (Google) Code Review
parent b0e25f71a8 95dc4733c0
commit 2fa8cf7360
36 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();