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

Commit e3ed7e75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13960089

Change-Id: Ia8e8206745f983379d7f53eeb26ffa19227c5299
parents 5e8ea462 f41fa968

core/res/res/values/attrs.xml

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

        <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. -->















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















































core/res/res/values/colors_device_defaults.xml



+3
−0




























Original line number
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_dark">@color/system_accent1_200</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_light">@color/system_neutral1_50</color>

































core/res/res/values/symbols.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -4220,6 +4220,10 @@





























  <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 -->















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















  <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.