diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-25 23:18:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 23:18:34 +0000 |
| commit | c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9 (patch) | |
| tree | 2dd1c53fc681bd4b9f060d3bedb0e513ecfb42e9 | |
| parent | e352845ecad452823bb2c3ba1b0eb1abf2e9a442 (diff) | |
| parent | 4895df355a6a770c557250f0951530479534dc79 (diff) | |
| download | packages_apps_Settings-c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9.zip packages_apps_Settings-c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9.tar.gz packages_apps_Settings-c61aabfa22e972a5173d2edc2aa5fd77fb37bdf9.tar.bz2 | |
Merge "Update material colors" into lmp-dev
| -rw-r--r-- | res/values/colors.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index cba8483..58687c9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -83,14 +83,14 @@ <!-- Default avatar colors --> <color name="pink_500">#ffe91e63</color> <color name="indigo_500">#ff3f51b5</color> - <color name="blue_500">@*android:color/material_blue_500</color> - <color name="teal_500">@*android:color/material_teal_500</color> - <color name="green_500">@*android:color/material_green_500</color> + <color name="blue_500">#ff4285f4</color> + <color name="teal_500">#ff00bcd4</color> + <color name="green_500">#ff0f9d58</color> <color name="light_green_500">#ff8bc34a</color> - <color name="orange_500">@*android:color/material_orange_500</color> - <color name="deep_orange_500">@*android:color/material_deep_orange_500</color> + <color name="orange_500">#ffff9800</color> + <color name="deep_orange_500">#ffff5722</color> <!-- Avatar color used for guest --> - <color name="grey_500">@*android:color/material_grey_500</color> + <color name="grey_500">#ff9e9e9e</color> <color name="wifi_divider">#ffe0e0e0</color> |