diff options
| author | 2015-10-06 18:19:19 +0000 | |
|---|---|---|
| committer | 2015-10-06 18:19:19 +0000 | |
| commit | 4525ebbd31f7750a11e9b34898c895fd2f23d6de (patch) | |
| tree | fcffa3fffc62d12697e6c7d827527a66f2c98c18 | |
| parent | acaaee06f6abdf61a320f40713657b03f461fe6c (diff) | |
| parent | c444319debe248119dcc182d28b026b4e545f8e6 (diff) | |
Merge "Clean up legacy colors"
| -rw-r--r-- | core/res/res/values/colors_holo.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/colors_legacy.xml | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/core/res/res/values/colors_holo.xml b/core/res/res/values/colors_holo.xml index 9d1dda547586..917c781812ca 100644 --- a/core/res/res/values/colors_holo.xml +++ b/core/res/res/values/colors_holo.xml @@ -78,14 +78,14 @@ <!-- Forward compatibility for Material-style theme colors --> <eat-comment /> - <color name="holo_primary_dark">#ff000000</color> + <color name="holo_primary_dark">@color/black</color> <color name="holo_primary">#ff222222</color> <color name="holo_control_activated">@color/holo_blue_light</color> <color name="holo_control_normal">#39cccccc</color> <color name="holo_button_pressed">#59f0f0f0</color> <color name="holo_button_normal">#bd292f34</color> - <color name="holo_light_primary_dark">#ff000000</color> + <color name="holo_light_primary_dark">@color/black</color> <color name="holo_light_primary">#ffe6e6e6</color> <color name="holo_light_control_activated">@color/holo_blue_light</color> <color name="holo_light_control_normal">#dacccccc</color> diff --git a/core/res/res/values/colors_legacy.xml b/core/res/res/values/colors_legacy.xml index ad22845174e4..8b9d22c20836 100644 --- a/core/res/res/values/colors_legacy.xml +++ b/core/res/res/values/colors_legacy.xml @@ -17,6 +17,12 @@ <!-- Colors specific to pre-Holo themes. --> <resources> + <!-- A bright Android-y green --> + <color name="legacy_green">#ff90df25</color> + + <!-- A bright orange suitable for use in the early 2000s --> + <color name="legacy_orange">#ff90df25</color> + <!-- Highlight colors for the legacy themes --> <eat-comment /> @@ -27,19 +33,17 @@ <!-- Forward compatibility for Material-style theme colors --> <eat-comment /> - <color name="legacy_primary_dark">#ff000000</color> - <color name="legacy_primary">#ffe6e6e6</color> - <color name="legacy_primary_light">#ffffffff</color> - <color name="legacy_control_activated">#ff90df25</color> + <color name="legacy_primary_dark">@color/black</color> + <color name="legacy_primary">#ff222222</color> + <color name="legacy_control_activated">@color/legacy_green</color> <color name="legacy_control_normal">#99ffffff</color> - <color name="legacy_button_pressed">#fffea50b</color> + <color name="legacy_button_pressed">@color/legacy_orange</color> <color name="legacy_button_normal">#f3dbdbdb</color> - <color name="legacy_light_primary_dark">@color/legacy_primary_dark</color> - <color name="legacy_light_primary">@color/legacy_primary</color> - <color name="legacy_light_primary_light">@color/legacy_primary_light</color> - <color name="legacy_light_control_activated">@color/legacy_control_activated</color> + <color name="legacy_light_primary_dark">@color/black</color> + <color name="legacy_light_primary">#ffe6e6e6</color> + <color name="legacy_light_control_activated">@color/legacy_green</color> <color name="legacy_light_control_normal">#99000000</color> - <color name="legacy_light_button_pressed">@color/legacy_button_pressed</color> - <color name="legacy_light_button_normal">@color/legacy_button_normal</color> + <color name="legacy_light_button_pressed">@color/legacy_orange</color> + <color name="legacy_light_button_normal">#f3dbdbdb</color> </resources> |