Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f3293e authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge \"Update QS battery trendline to use theme color.\" into nyc-mr1-dev 

am: 3d29644f

Change-Id: I05814fb1551543294aa3bf0b254d0d5e17ff417e
parents b53c9c16 3d29644f

core/res/res/values/colors_device_defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/colors_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/SettingsLib/res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>