Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

colors: Properly set the default accent colors.

Browse Source 
am: 7b371575e4

Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
This commit is contained in:
Alain Vongsouvanh
2016-11-10 02:40:55 +00:00
committed by android-build-merger
parent 6a6bc370e9 7b371575e4
commit e616fa1789
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/res/res/values-watch/colors_material.xml
View File

@@ -14,13 +14,13 @@
limitations under the License. limitations under the License.
--> -->
<resources> <resources>
<color name="background_material_dark">#ff232e33</color> <color name="background_material_dark">#232E33</color>
<color name="background_floating_material_dark">#ff3e5059</color> <color name="background_floating_material_dark">#3E5059</color>
<color name="accent_material_700">#ff2e4978</color> <color name="accent_material_700">#5385DB</color>
<color name="accent_material_light">#ff4285f4</color> <color name="accent_material_light">#75A4F5</color>
<color name="accent_material_dark">#ff5e97f6</color> <color name="accent_material_dark">#5E97F6</color>
<color name="accent_material_50">#ffd0def7</color> <color name="accent_material_50">#93B7F5</color>
<color name="primary_material_dark">#4D4D4D</color> <color name="primary_material_dark">#4D4D4D</color>

4
core/res/res/values/colors_device_defaults.xml
View File

@@ -28,10 +28,10 @@
<color name="tertiary_device_default_settings">@color/tertiary_material_settings</color> <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color>
<color name="quaternary_device_default_settings">@color/quaternary_material_settings</color> <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color>
<color name="accent_device_default_700">@color/material_deep_teal_700</color> <color name="accent_device_default_700">@color/accent_material_700</color>
<color name="accent_device_default_light">@color/accent_material_light</color> <color name="accent_device_default_light">@color/accent_material_light</color>
<color name="accent_device_default_dark">@color/accent_material_dark</color> <color name="accent_device_default_dark">@color/accent_material_dark</color>
<color name="accent_device_default_50">@color/material_deep_teal_50</color> <color name="accent_device_default_50">@color/accent_material_50</color>
<color name="background_device_default_dark">@color/background_material_dark</color> <color name="background_device_default_dark">@color/background_material_dark</color>
<color name="background_device_default_light">@color/background_material_light</color> <color name="background_device_default_light">@color/background_material_light</color>