From 7b371575e4c62c065ef9f66f3afa288c8691dfb4 Mon Sep 17 00:00:00 2001 From: Alain Vongsouvanh Date: Wed, 9 Nov 2016 14:52:37 -0800 Subject: [PATCH] colors: Properly set the default accent colors. The 700 and 50 variant of the default accent colors were pointing to the wrong material resources (deep_teal instead of accent). This CL also update the watch colors to the proper specs. BUG: 32087183 Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb --- core/res/res/values-watch/colors_material.xml | 12 ++++++------ core/res/res/values/colors_device_defaults.xml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/res/res/values-watch/colors_material.xml b/core/res/res/values-watch/colors_material.xml index 18bfd4db5ae04..1456976e897e4 100644 --- a/core/res/res/values-watch/colors_material.xml +++ b/core/res/res/values-watch/colors_material.xml @@ -14,13 +14,13 @@ limitations under the License. --> - #ff232e33 - #ff3e5059 + #232E33 + #3E5059 - #ff2e4978 - #ff4285f4 - #ff5e97f6 - #ffd0def7 + #5385DB + #75A4F5 + #5E97F6 + #93B7F5 #4D4D4D diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml index 89691e90d46ed..8f0350a887b96 100644 --- a/core/res/res/values/colors_device_defaults.xml +++ b/core/res/res/values/colors_device_defaults.xml @@ -28,10 +28,10 @@ @color/tertiary_material_settings @color/quaternary_material_settings - @color/material_deep_teal_700 + @color/accent_material_700 @color/accent_material_light @color/accent_material_dark - @color/material_deep_teal_50 + @color/accent_material_50 @color/background_material_dark @color/background_material_light