diff --git a/res/drawable-hdpi/avatar_default_1.png b/res/drawable-hdpi/avatar_default_1.png new file mode 100644 index 00000000000..39ffd73d71a Binary files /dev/null and b/res/drawable-hdpi/avatar_default_1.png differ diff --git a/res/drawable-hdpi/avatar_default_2.png b/res/drawable-hdpi/avatar_default_2.png new file mode 100644 index 00000000000..79203c50af8 Binary files /dev/null and b/res/drawable-hdpi/avatar_default_2.png differ diff --git a/res/drawable-hdpi/avatar_default_3.png b/res/drawable-hdpi/avatar_default_3.png new file mode 100644 index 00000000000..4d179b30911 Binary files /dev/null and b/res/drawable-hdpi/avatar_default_3.png differ diff --git a/res/drawable-hdpi/avatar_default_4.png b/res/drawable-hdpi/avatar_default_4.png new file mode 100644 index 00000000000..1a0332f05ec Binary files /dev/null and b/res/drawable-hdpi/avatar_default_4.png differ diff --git a/res/drawable-hdpi/avatar_default_5.png b/res/drawable-hdpi/avatar_default_5.png new file mode 100644 index 00000000000..2487e66d9e0 Binary files /dev/null and b/res/drawable-hdpi/avatar_default_5.png differ diff --git a/res/drawable-hdpi/avatar_default_6.png b/res/drawable-hdpi/avatar_default_6.png new file mode 100644 index 00000000000..f57e1ebbcce Binary files /dev/null and b/res/drawable-hdpi/avatar_default_6.png differ diff --git a/res/drawable-hdpi/avatar_default_7.png b/res/drawable-hdpi/avatar_default_7.png new file mode 100644 index 00000000000..dc4b2ce5a74 Binary files /dev/null and b/res/drawable-hdpi/avatar_default_7.png differ diff --git a/res/drawable-hdpi/avatar_default_8.png b/res/drawable-hdpi/avatar_default_8.png new file mode 100644 index 00000000000..64e7936ddc0 Binary files /dev/null and b/res/drawable-hdpi/avatar_default_8.png differ diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png new file mode 100644 index 00000000000..74af8ae07f4 Binary files /dev/null and b/res/drawable-hdpi/ic_settings_multiuser.png differ diff --git a/res/drawable-mdpi/avatar_default_1.png b/res/drawable-mdpi/avatar_default_1.png new file mode 100644 index 00000000000..0d8e3a21a2d Binary files /dev/null and b/res/drawable-mdpi/avatar_default_1.png differ diff --git a/res/drawable-mdpi/avatar_default_2.png b/res/drawable-mdpi/avatar_default_2.png new file mode 100644 index 00000000000..0cc4c3dbac4 Binary files /dev/null and b/res/drawable-mdpi/avatar_default_2.png differ diff --git a/res/drawable-mdpi/avatar_default_3.png b/res/drawable-mdpi/avatar_default_3.png new file mode 100644 index 00000000000..c43ad6f53af Binary files /dev/null and b/res/drawable-mdpi/avatar_default_3.png differ diff --git a/res/drawable-mdpi/avatar_default_4.png b/res/drawable-mdpi/avatar_default_4.png new file mode 100644 index 00000000000..6906489e95c Binary files /dev/null and b/res/drawable-mdpi/avatar_default_4.png differ diff --git a/res/drawable-mdpi/avatar_default_5.png b/res/drawable-mdpi/avatar_default_5.png new file mode 100644 index 00000000000..857f277d26f Binary files /dev/null and b/res/drawable-mdpi/avatar_default_5.png differ diff --git a/res/drawable-mdpi/avatar_default_6.png b/res/drawable-mdpi/avatar_default_6.png new file mode 100644 index 00000000000..9d0f968e726 Binary files /dev/null and b/res/drawable-mdpi/avatar_default_6.png differ diff --git a/res/drawable-mdpi/avatar_default_7.png b/res/drawable-mdpi/avatar_default_7.png new file mode 100644 index 00000000000..7db88647d2a Binary files /dev/null and b/res/drawable-mdpi/avatar_default_7.png differ diff --git a/res/drawable-mdpi/avatar_default_8.png b/res/drawable-mdpi/avatar_default_8.png new file mode 100644 index 00000000000..98d67d997a4 Binary files /dev/null and b/res/drawable-mdpi/avatar_default_8.png differ diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png new file mode 100644 index 00000000000..758c9ec5d71 Binary files /dev/null and b/res/drawable-mdpi/ic_settings_multiuser.png differ diff --git a/res/drawable-xhdpi/avatar_default_1.png b/res/drawable-xhdpi/avatar_default_1.png new file mode 100644 index 00000000000..6caa06a5d1e Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_1.png differ diff --git a/res/drawable-xhdpi/avatar_default_2.png b/res/drawable-xhdpi/avatar_default_2.png new file mode 100644 index 00000000000..faf3b15f7a7 Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_2.png differ diff --git a/res/drawable-xhdpi/avatar_default_3.png b/res/drawable-xhdpi/avatar_default_3.png new file mode 100644 index 00000000000..63a80ff5697 Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_3.png differ diff --git a/res/drawable-xhdpi/avatar_default_4.png b/res/drawable-xhdpi/avatar_default_4.png new file mode 100644 index 00000000000..d743dc62172 Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_4.png differ diff --git a/res/drawable-xhdpi/avatar_default_5.png b/res/drawable-xhdpi/avatar_default_5.png new file mode 100644 index 00000000000..b7b822b92f8 Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_5.png differ diff --git a/res/drawable-xhdpi/avatar_default_6.png b/res/drawable-xhdpi/avatar_default_6.png new file mode 100644 index 00000000000..f5b5e84851c Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_6.png differ diff --git a/res/drawable-xhdpi/avatar_default_7.png b/res/drawable-xhdpi/avatar_default_7.png new file mode 100644 index 00000000000..4271c0d70f3 Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_7.png differ diff --git a/res/drawable-xhdpi/avatar_default_8.png b/res/drawable-xhdpi/avatar_default_8.png new file mode 100644 index 00000000000..27261a597be Binary files /dev/null and b/res/drawable-xhdpi/avatar_default_8.png differ diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png new file mode 100644 index 00000000000..dbf8cd4b680 Binary files /dev/null and b/res/drawable-xhdpi/ic_settings_multiuser.png differ diff --git a/res/drawable/ic_user.png b/res/drawable/ic_user.png deleted file mode 100644 index dc4c390f0da..00000000000 Binary files a/res/drawable/ic_user.png and /dev/null differ diff --git a/res/drawable/ic_user_cyan.png b/res/drawable/ic_user_cyan.png deleted file mode 100644 index c21261582e2..00000000000 Binary files a/res/drawable/ic_user_cyan.png and /dev/null differ diff --git a/res/drawable/ic_user_green.png b/res/drawable/ic_user_green.png deleted file mode 100644 index ca09f8534e4..00000000000 Binary files a/res/drawable/ic_user_green.png and /dev/null differ diff --git a/res/drawable/ic_user_orange.png b/res/drawable/ic_user_orange.png deleted file mode 100644 index 789d8928fa8..00000000000 Binary files a/res/drawable/ic_user_orange.png and /dev/null differ diff --git a/res/drawable/ic_user_purple.png b/res/drawable/ic_user_purple.png deleted file mode 100644 index b7bdeb290d8..00000000000 Binary files a/res/drawable/ic_user_purple.png and /dev/null differ diff --git a/res/drawable/ic_user_red.png b/res/drawable/ic_user_red.png deleted file mode 100644 index c4b4e298afa..00000000000 Binary files a/res/drawable/ic_user_red.png and /dev/null differ diff --git a/res/drawable/ic_user_yellow.png b/res/drawable/ic_user_yellow.png deleted file mode 100644 index c46838cd34e..00000000000 Binary files a/res/drawable/ic_user_yellow.png and /dev/null differ diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 6251590680b..05fa31f3d90 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -100,7 +100,7 @@
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index bcc70bdba5a..984ac0896ff 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();