Use new color avatar assets

Bug: 7204409
Bug: 7222997
Change-Id: Iac2c4ab2d7bf0090670573bf4c967f07abdf6f51

36 files changed, 11 insertions, 9 deletions

diff --git a/res/drawable-hdpi/avatar_default_1.png b/res/drawable-hdpi/avatar_default_1.png
new file mode 100644
index 000000000..39ffd73d7
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_1.png
diff --git a/res/drawable-hdpi/avatar_default_2.png b/res/drawable-hdpi/avatar_default_2.png
new file mode 100644
index 000000000..79203c50a
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_2.png
diff --git a/res/drawable-hdpi/avatar_default_3.png b/res/drawable-hdpi/avatar_default_3.png
new file mode 100644
index 000000000..4d179b309
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_3.png
diff --git a/res/drawable-hdpi/avatar_default_4.png b/res/drawable-hdpi/avatar_default_4.png
new file mode 100644
index 000000000..1a0332f05
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_4.png
diff --git a/res/drawable-hdpi/avatar_default_5.png b/res/drawable-hdpi/avatar_default_5.png
new file mode 100644
index 000000000..2487e66d9
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_5.png
diff --git a/res/drawable-hdpi/avatar_default_6.png b/res/drawable-hdpi/avatar_default_6.png
new file mode 100644
index 000000000..f57e1ebbc
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_6.png
diff --git a/res/drawable-hdpi/avatar_default_7.png b/res/drawable-hdpi/avatar_default_7.png
new file mode 100644
index 000000000..dc4b2ce5a
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_7.png
diff --git a/res/drawable-hdpi/avatar_default_8.png b/res/drawable-hdpi/avatar_default_8.png
new file mode 100644
index 000000000..64e7936dd
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_8.png
diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png
new file mode 100644
index 000000000..74af8ae07
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_multiuser.png
diff --git a/res/drawable-mdpi/avatar_default_1.png b/res/drawable-mdpi/avatar_default_1.png
new file mode 100644
index 000000000..0d8e3a21a
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_1.png
diff --git a/res/drawable-mdpi/avatar_default_2.png b/res/drawable-mdpi/avatar_default_2.png
new file mode 100644
index 000000000..0cc4c3dba
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_2.png
diff --git a/res/drawable-mdpi/avatar_default_3.png b/res/drawable-mdpi/avatar_default_3.png
new file mode 100644
index 000000000..c43ad6f53
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_3.png
diff --git a/res/drawable-mdpi/avatar_default_4.png b/res/drawable-mdpi/avatar_default_4.png
new file mode 100644
index 000000000..6906489e9
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_4.png
diff --git a/res/drawable-mdpi/avatar_default_5.png b/res/drawable-mdpi/avatar_default_5.png
new file mode 100644
index 000000000..857f277d2
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_5.png
diff --git a/res/drawable-mdpi/avatar_default_6.png b/res/drawable-mdpi/avatar_default_6.png
new file mode 100644
index 000000000..9d0f968e7
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_6.png
diff --git a/res/drawable-mdpi/avatar_default_7.png b/res/drawable-mdpi/avatar_default_7.png
new file mode 100644
index 000000000..7db88647d
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_7.png
diff --git a/res/drawable-mdpi/avatar_default_8.png b/res/drawable-mdpi/avatar_default_8.png
new file mode 100644
index 000000000..98d67d997
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_8.png
diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png
new file mode 100644
index 000000000..758c9ec5d
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_multiuser.png
diff --git a/res/drawable-xhdpi/avatar_default_1.png b/res/drawable-xhdpi/avatar_default_1.png
new file mode 100644
index 000000000..6caa06a5d
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_1.png
diff --git a/res/drawable-xhdpi/avatar_default_2.png b/res/drawable-xhdpi/avatar_default_2.png
new file mode 100644
index 000000000..faf3b15f7
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_2.png
diff --git a/res/drawable-xhdpi/avatar_default_3.png b/res/drawable-xhdpi/avatar_default_3.png
new file mode 100644
index 000000000..63a80ff56
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_3.png
diff --git a/res/drawable-xhdpi/avatar_default_4.png b/res/drawable-xhdpi/avatar_default_4.png
new file mode 100644
index 000000000..d743dc621
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_4.png
diff --git a/res/drawable-xhdpi/avatar_default_5.png b/res/drawable-xhdpi/avatar_default_5.png
new file mode 100644
index 000000000..b7b822b92
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_5.png
diff --git a/res/drawable-xhdpi/avatar_default_6.png b/res/drawable-xhdpi/avatar_default_6.png
new file mode 100644
index 000000000..f5b5e8485
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_6.png
diff --git a/res/drawable-xhdpi/avatar_default_7.png b/res/drawable-xhdpi/avatar_default_7.png
new file mode 100644
index 000000000..4271c0d70
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_7.png
diff --git a/res/drawable-xhdpi/avatar_default_8.png b/res/drawable-xhdpi/avatar_default_8.png
new file mode 100644
index 000000000..27261a597
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_8.png
diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png
new file mode 100644
index 000000000..dbf8cd4b6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_multiuser.png
diff --git a/res/drawable/ic_user.png b/res/drawable/ic_user.png
deleted file mode 100644
index dc4c390f0..000000000
--- a/res/drawable/ic_user.png
+++ /dev/null
diff --git a/res/drawable/ic_user_cyan.png b/res/drawable/ic_user_cyan.png
deleted file mode 100644
index c21261582..000000000
--- a/res/drawable/ic_user_cyan.png
+++ /dev/null
diff --git a/res/drawable/ic_user_green.png b/res/drawable/ic_user_green.png
deleted file mode 100644
index ca09f8534..000000000
--- a/res/drawable/ic_user_green.png
+++ /dev/null
diff --git a/res/drawable/ic_user_orange.png b/res/drawable/ic_user_orange.png
deleted file mode 100644
index 789d8928f..000000000
--- a/res/drawable/ic_user_orange.png
+++ /dev/null
diff --git a/res/drawable/ic_user_purple.png b/res/drawable/ic_user_purple.png
deleted file mode 100644
index b7bdeb290..000000000
--- a/res/drawable/ic_user_purple.png
+++ /dev/null
diff --git a/res/drawable/ic_user_red.png b/res/drawable/ic_user_red.png
deleted file mode 100644
index c4b4e298a..000000000
--- a/res/drawable/ic_user_red.png
+++ /dev/null
diff --git a/res/drawable/ic_user_yellow.png b/res/drawable/ic_user_yellow.png
deleted file mode 100644
index c46838cd3..000000000
--- a/res/drawable/ic_user_yellow.png
+++ /dev/null
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 625159068..05fa31f3d 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -100,7 +100,7 @@
     <!-- Manage users -->
     <header
         android:fragment="com.android.settings.users.UserSettings"
-        android:icon="@drawable/ic_settings_sync"
+        android:icon="@drawable/ic_settings_multiuser"
         android:title="@string/user_settings_title"
         android:id="@+id/user_settings" />
 
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 33b4195d2..7d08d75c7 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -85,12 +85,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;
@@ -419,7 +421,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);
                 }
@@ -432,7 +434,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();