summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-09-17 11:49:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-17 11:49:29 +0000
commit16ebe98d9a0195b737497f4d704475a195aa3f5d (patch)
treeedec9995ddf10c1c36f316e1abdad5c4d9c73c1b
parent58bacc513c5e665c62e7d82cc6f39196b4ff4302 (diff)
parentffe1716ae29e174595b7060246c000b6f421db75 (diff)
downloadframeworks_base-16ebe98d9a0195b737497f4d704475a195aa3f5d.zip
frameworks_base-16ebe98d9a0195b737497f4d704475a195aa3f5d.tar.gz
frameworks_base-16ebe98d9a0195b737497f4d704475a195aa3f5d.tar.bz2
Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
-rw-r--r--core/res/res/values/colors.xml4
1 files changed, 2 insertions, 2 deletions
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 -->