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

Commit 71fa2dba authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "Fix Token name onThmeAppRing to themNotif." into main

parents 34ffda11 b27c9362

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ 
        <!-- @hide -->

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

        <!-- @hide -->

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

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

        <!-- @hide -->

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

        <!-- @hide -->

core/res/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ 
    <color name="system_theme_app_light">#2F4578</color>

    <color name="system_on_theme_app_light">#D6DFFF</color>

    <color name="system_theme_app_ring_light">#94AAE4</color>

    <color name="system_on_theme_app_ring_light">#FDD7FA</color>

    <color name="system_theme_notif_light">#FDD7FA</color>

    <color name="system_brand_a_light">#3A5084</color>

    <color name="system_brand_b_light">#6E7488</color>

    <color name="system_brand_c_light">#6076AC</color>
@@ -611,7 +611,7 @@ 
    <color name="system_theme_app_dark">#D9E2FF</color>

    <color name="system_on_theme_app_dark">#304679</color>

    <color name="system_theme_app_ring_dark">#94AAE4</color>

    <color name="system_on_theme_app_ring_dark">#E0BBDD</color>

    <color name="system_theme_notif_dark">#E0BBDD</color>

    <color name="system_brand_a_dark">#90A6DF</color>

    <color name="system_brand_b_dark">#A4ABC1</color>

    <color name="system_brand_c_dark">#7A90C8</color>

core/res/res/values/symbols.xml

+3 −3
Original line number Diff line number Diff line
@@ -5307,7 +5307,7 @@ 
  <java-symbol name="customColorThemeApp" type="attr"/>

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

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

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

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

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

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

  <java-symbol name="customColorBrandC" type="attr"/>
@@ -5329,7 +5329,7 @@ 
  <java-symbol name="system_theme_app_light" type="color"/>

  <java-symbol name="system_on_theme_app_light" type="color"/>

  <java-symbol name="system_theme_app_ring_light" type="color"/>

  <java-symbol name="system_on_theme_app_ring_light" type="color"/>

  <java-symbol name="system_theme_notif_light" type="color"/>

  <java-symbol name="system_brand_a_light" type="color"/>

  <java-symbol name="system_brand_b_light" type="color"/>

  <java-symbol name="system_brand_c_light" type="color"/>
@@ -5350,7 +5350,7 @@ 
  <java-symbol name="system_theme_app_dark" type="color"/>

  <java-symbol name="system_on_theme_app_dark" type="color"/>

  <java-symbol name="system_theme_app_ring_dark" type="color"/>

  <java-symbol name="system_on_theme_app_ring_dark" type="color"/>

  <java-symbol name="system_theme_notif_dark" type="color"/>

  <java-symbol name="system_brand_a_dark" type="color"/>

  <java-symbol name="system_brand_b_dark" type="color"/>

  <java-symbol name="system_brand_c_dark" type="color"/>

core/res/res/values/themes_device_defaults.xml

+51 −51

File changed.

Preview size limit exceeded, changes collapsed.