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

Commit f41fa968 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add NEXT accent colors to Theme.DeviceDefault" into sc-dev

parents 41d74dfe 33d412eb

core/res/res/values/attrs.xml

+9 −0
Original line number Original line Diff line number Diff line
@@ -1125,6 +1125,15 @@ 
             to framework controls (via colorControlActivated). -->

             to framework controls (via colorControlActivated). -->

        <attr name="colorAccent" format="color" />

        <attr name="colorAccent" format="color" />




















        <!-- Light accent color used on Material NEXT buttons. @hide -->














        <attr name="colorAccentPrimary" format="color" />



























        <!-- Secondary accent color used on Material NEXT buttons. @hide -->














        <attr name="colorAccentSecondary" format="color" />



























        <!-- Tertiary accent color used on Material NEXT buttons. @hide -->














        <attr name="colorAccentTertiary" format="color" />
























        <!-- The color applied to framework controls in their normal state. -->







        <!-- The color applied to framework controls in their normal state. -->











        <attr name="colorControlNormal" format="color" />







        <attr name="colorControlNormal" format="color" />

















































core/res/res/values/colors_device_defaults.xml



+3
−0




























Original line number
Original line
Diff line number
Diff line








@@ -36,6 +36,9 @@









    <color name="accent_device_default_light">@color/system_accent1_600</color>







    <color name="accent_device_default_light">@color/system_accent1_600</color>











    <color name="accent_device_default_dark">@color/system_accent1_200</color>







    <color name="accent_device_default_dark">@color/system_accent1_200</color>











    <color name="accent_device_default">@color/accent_device_default_light</color>







    <color name="accent_device_default">@color/accent_device_default_light</color>














    <color name="accent_primary_device_default">@color/system_accent1_100</color>














    <color name="accent_secondary_device_default">@color/system_accent2_100</color>














    <color name="accent_tertiary_device_default">@color/system_accent3_100</color>































    <color name="background_device_default_dark">@color/system_neutral1_800</color>







    <color name="background_device_default_dark">@color/system_neutral1_800</color>











    <color name="background_device_default_light">@color/system_neutral1_50</color>







    <color name="background_device_default_light">@color/system_neutral1_50</color>

































core/res/res/values/symbols.xml



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -4219,6 +4219,10 @@





























  <java-symbol type="bool" name="config_enableOneHandedKeyguard" />







  <java-symbol type="bool" name="config_enableOneHandedKeyguard" />


































  <java-symbol type="attr" name="colorAccentPrimary" />














  <java-symbol type="attr" name="colorAccentSecondary" />














  <java-symbol type="attr" name="colorAccentTertiary" />


























  <!-- CEC Configuration -->







  <!-- CEC Configuration -->











  <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" />







  <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" />











  <java-symbol type="bool" name="config_cecHdmiCecControlEnabled_allowed" />







  <java-symbol type="bool" name="config_cecHdmiCecControlEnabled_allowed" />

































core/res/res/values/themes_device_defaults.xml



+147
−0


























File changed.
Preview size limit exceeded, changes collapsed.