am 02d41b91: am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev

* commit '02d41b916c24eb458b7ce695d0663cbe6c49a4b8':
  Switch to using system-wide default user icons
This commit is contained in:
Alexandra Gherghina
2014-09-12 19:29:07 +00:00
committed by Android Git Automerger
20 changed files with 39 additions and 323 deletions

View File

@@ -80,18 +80,6 @@
<color name="setup_wizard_preference_background_color_dark">@*android:color/background_material_dark</color>
<color name="setup_wizard_preference_background_color_light">@*android:color/background_material_light</color>
<!-- Default avatar colors -->
<color name="pink_500">#ffe91e63</color>
<color name="indigo_500">#ff3f51b5</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">#ffff9800</color>
<color name="deep_orange_500">#ffff5722</color>
<!-- Avatar color used for guest -->
<color name="grey_500">#ff9e9e9e</color>
<color name="wifi_divider">#ffe0e0e0</color>
</resources>