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

Commit 33d412eb authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Add NEXT accent colors to Theme.DeviceDefault

The new accent colors always have the 100 shade regardless of being in
light or dark theme. We should always use dark text on top of them.

Bug: 183454454
Test: visual, on notifications
Change-Id: I123213f5eda027f99f34e4ff38d3093470278af4
parent 358a76f7
Loading
Loading
Loading
Loading
+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" />
+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>
+4 −0
Original line number Diff line number Diff line
@@ -4232,6 +4232,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" />
+147 −0

File changed.

Preview size limit exceeded, changes collapsed.