diff options
| author | 2016-06-24 18:19:30 +0000 | |
|---|---|---|
| committer | 2016-06-24 18:19:32 +0000 | |
| commit | 3d29644f28e2f7a3304b464c43e8d617312da0a3 (patch) | |
| tree | 41509729731b40b20af6ec99b5c94ef3943d2b7b | |
| parent | 7f9c189f066278d2163615e870d6e107b12eb733 (diff) | |
| parent | f329ebe31901bbc92a346a90b8861d563003166a (diff) | |
Merge "Update QS battery trendline to use theme color." into nyc-mr1-dev
| -rw-r--r-- | core/res/res/values/colors_device_defaults.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/colors_material.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/colors.xml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml index e830b64094f4..5518de2d5c24 100644 --- a/core/res/res/values/colors_device_defaults.xml +++ b/core/res/res/values/colors_device_defaults.xml @@ -25,6 +25,7 @@ <color name="primary_dark_device_default_settings">@color/primary_dark_material_settings</color> <color name="secondary_device_default_settings">@color/secondary_material_settings</color> + <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color> <color name="accent_device_default_light">@color/accent_material_light</color> <color name="accent_device_default_dark">@color/accent_material_dark</color> diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index a18abdf9712c..2ac4092a5079 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -33,6 +33,7 @@ <color name="primary_dark_material_settings">@color/material_blue_grey_950</color> <color name="secondary_material_settings">@color/material_blue_grey_800</color> + <color name="tertiary_material_settings">@color/material_blue_grey_700</color> <color name="accent_material_light">@color/material_deep_teal_500</color> <color name="accent_material_dark">@color/material_deep_teal_200</color> @@ -84,6 +85,7 @@ <color name="material_deep_teal_300">#ff4db6ac</color> <color name="material_deep_teal_500">#ff009688</color> + <color name="material_blue_grey_700">#ff455a64</color> <color name="material_blue_grey_800">#ff37474f</color> <color name="material_blue_grey_900">#ff263238</color> <color name="material_blue_grey_950">#ff21272b</color> diff --git a/packages/SettingsLib/res/values/colors.xml b/packages/SettingsLib/res/values/colors.xml index 796273dc36a9..02b7ea6ef7a8 100644 --- a/packages/SettingsLib/res/values/colors.xml +++ b/packages/SettingsLib/res/values/colors.xml @@ -17,5 +17,5 @@ <resources> <color name="disabled_text_color">#66000000</color> <!-- 38% black --> - <color name="usage_graph_dots">#455A64</color> + <color name="usage_graph_dots">@*android:color/tertiary_device_default_settings</color> </resources> |