commit 381b657859a43798bad8ce06980a3993f0b0d251
author Alexandra Gherghina <alexgherghina@google.com> Wed Sep 17 12:01:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 12:01:28 2014 +0000
tree 3b13ad40119000394868d9d1c3729f2ecdaef748
parent 04c5ecae44a2efb579804a3836b78555e3a7dc30
parent 16ebe98d9a0195b737497f4d704475a195aa3f5d

am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev

* commit '5ec5768864e9a9dfc4dac4d0afe2f0593b070d08':
  Reorder user icon colors so that the first default is teal

core/res/res/values/colors.xml

diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index 5a7e168..cbaf54f 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -148,10 +148,10 @@
     <color name="battery_saver_mode_color">#fff4511e</color><!-- deep orange 600 -->
 
     <!-- Default user icon colors -->
-    <color name="user_icon_1">#ffe91e63</color><!-- pink 500 -->
+    <color name="user_icon_1">#ff00bcd4</color><!-- teal 500 -->
     <color name="user_icon_2">#ff3f51b5</color><!-- indigo 500 -->
     <color name="user_icon_3">#ff4285f4</color><!-- blue 500 -->
-    <color name="user_icon_4">#ff00bcd4</color><!-- teal 500 -->
+    <color name="user_icon_4">#ffe91e63</color><!-- pink 500 -->
     <color name="user_icon_5">#ff0f9d58</color><!-- green 500 -->
     <color name="user_icon_6">#ff8bc34a</color><!-- light green 500 -->
     <color name="user_icon_7">#ffff9800</color><!-- orange 500 -->