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

Commit cde8b906 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Winson Chiu
Browse files

[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources"... 

[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources" into udc-dev am: c6c42579

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



RESOURCES_FINALIZATION=Merge conflict, no actual diff

Change-Id: Idff15d01ac2b01502afcfb519f877977f52f3fe3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1af864c c6c42579

core/api/current.txt

+12 −24
Original line number Diff line number Diff line
@@ -2014,18 +2014,14 @@ package android { 
    field public static final int system_on_primary_container_dark;

    field public static final int system_on_primary_container_light;

    field public static final int system_on_primary_dark;

    field public static final int system_on_primary_fixed_dark;

    field public static final int system_on_primary_fixed_light;

    field public static final int system_on_primary_fixed_variant_dark;

    field public static final int system_on_primary_fixed_variant_light;

    field public static final int system_on_primary_fixed;

    field public static final int system_on_primary_fixed_variant;

    field public static final int system_on_primary_light;

    field public static final int system_on_secondary_container_dark;

    field public static final int system_on_secondary_container_light;

    field public static final int system_on_secondary_dark;

    field public static final int system_on_secondary_fixed_dark;

    field public static final int system_on_secondary_fixed_light;

    field public static final int system_on_secondary_fixed_variant_dark;

    field public static final int system_on_secondary_fixed_variant_light;

    field public static final int system_on_secondary_fixed;

    field public static final int system_on_secondary_fixed_variant;

    field public static final int system_on_secondary_light;

    field public static final int system_on_surface_dark;

    field public static final int system_on_surface_light;
@@ -2034,10 +2030,8 @@ package android { 
    field public static final int system_on_tertiary_container_dark;

    field public static final int system_on_tertiary_container_light;

    field public static final int system_on_tertiary_dark;

    field public static final int system_on_tertiary_fixed_dark;

    field public static final int system_on_tertiary_fixed_light;

    field public static final int system_on_tertiary_fixed_variant_dark;

    field public static final int system_on_tertiary_fixed_variant_light;

    field public static final int system_on_tertiary_fixed;

    field public static final int system_on_tertiary_fixed_variant;

    field public static final int system_on_tertiary_light;

    field public static final int system_outline_dark;

    field public static final int system_outline_light;
@@ -2054,18 +2048,14 @@ package android { 
    field public static final int system_primary_container_dark;

    field public static final int system_primary_container_light;

    field public static final int system_primary_dark;

    field public static final int system_primary_fixed_dark;

    field public static final int system_primary_fixed_dim_dark;

    field public static final int system_primary_fixed_dim_light;

    field public static final int system_primary_fixed_light;

    field public static final int system_primary_fixed;

    field public static final int system_primary_fixed_dim;

    field public static final int system_primary_light;

    field public static final int system_secondary_container_dark;

    field public static final int system_secondary_container_light;

    field public static final int system_secondary_dark;

    field public static final int system_secondary_fixed_dark;

    field public static final int system_secondary_fixed_dim_dark;

    field public static final int system_secondary_fixed_dim_light;

    field public static final int system_secondary_fixed_light;

    field public static final int system_secondary_fixed;

    field public static final int system_secondary_fixed_dim;

    field public static final int system_secondary_light;

    field public static final int system_surface_bright_dark;

    field public static final int system_surface_bright_light;
@@ -2088,10 +2078,8 @@ package android { 
    field public static final int system_tertiary_container_dark;

    field public static final int system_tertiary_container_light;

    field public static final int system_tertiary_dark;

    field public static final int system_tertiary_fixed_dark;

    field public static final int system_tertiary_fixed_dim_dark;

    field public static final int system_tertiary_fixed_dim_light;

    field public static final int system_tertiary_fixed_light;

    field public static final int system_tertiary_fixed;

    field public static final int system_tertiary_fixed_dim;

    field public static final int system_tertiary_light;

    field public static final int system_text_hint_inverse_dark;

    field public static final int system_text_hint_inverse_light;

core/res/res/values/colors.xml

+12 −24
Original line number Diff line number Diff line
@@ -469,18 +469,18 @@ 
    <color name="system_on_error_light">#FFFFFF</color>

    <color name="system_error_container_light">#FFDAD5</color>

    <color name="system_on_error_container_light">#410000</color>

    <color name="system_primary_fixed_light">#D8E2FF</color>

    <color name="system_primary_fixed_dim_light">#ADC6FF</color>

    <color name="system_on_primary_fixed_light">#001A41</color>

    <color name="system_on_primary_fixed_variant_light">#2B4678</color>

    <color name="system_secondary_fixed_light">#DBE2F9</color>

    <color name="system_secondary_fixed_dim_light">#BFC6DC</color>

    <color name="system_on_secondary_fixed_light">#141B2C</color>

    <color name="system_on_secondary_fixed_variant_light">#3F4759</color>

    <color name="system_tertiary_fixed_light">#FBD7FC</color>

    <color name="system_tertiary_fixed_dim_light">#DEBCDF</color>

    <color name="system_on_tertiary_fixed_light">#29132D</color>

    <color name="system_on_tertiary_fixed_variant_light">#583E5B</color>

    <color name="system_primary_fixed">#D8E2FF</color>

    <color name="system_primary_fixed_dim">#ADC6FF</color>

    <color name="system_on_primary_fixed">#001A41</color>

    <color name="system_on_primary_fixed_variant">#2B4678</color>

    <color name="system_secondary_fixed">#DBE2F9</color>

    <color name="system_secondary_fixed_dim">#BFC6DC</color>

    <color name="system_on_secondary_fixed">#141B2C</color>

    <color name="system_on_secondary_fixed_variant">#3F4759</color>

    <color name="system_tertiary_fixed">#FBD7FC</color>

    <color name="system_tertiary_fixed_dim">#DEBCDF</color>

    <color name="system_on_tertiary_fixed">#29132D</color>

    <color name="system_on_tertiary_fixed_variant">#583E5B</color>

    <color name="system_control_activated_light">#D8E2FF</color>

    <color name="system_control_normal_light">#44474F</color>

    <color name="system_control_highlight_light">#1F000000</color>
@@ -524,18 +524,6 @@ 
    <color name="system_on_error_dark">#690001</color>

    <color name="system_error_container_dark">#930001</color>

    <color name="system_on_error_container_dark">#FFDAD5</color>

    <color name="system_primary_fixed_dark">#D8E2FF</color>

    <color name="system_primary_fixed_dim_dark">#ADC6FF</color>

    <color name="system_on_primary_fixed_dark">#001A41</color>

    <color name="system_on_primary_fixed_variant_dark">#2B4678</color>

    <color name="system_secondary_fixed_dark">#DBE2F9</color>

    <color name="system_secondary_fixed_dim_dark">#BFC6DC</color>

    <color name="system_on_secondary_fixed_dark">#141B2C</color>

    <color name="system_on_secondary_fixed_variant_dark">#3F4759</color>

    <color name="system_tertiary_fixed_dark">#FBD7FC</color>

    <color name="system_tertiary_fixed_dim_dark">#DEBCDF</color>

    <color name="system_on_tertiary_fixed_dark">#29132D</color>

    <color name="system_on_tertiary_fixed_variant_dark">#583E5B</color>

    <color name="system_control_activated_dark">#2B4678</color>

    <color name="system_control_normal_dark">#C4C6D0</color>

    <color name="system_control_highlight_dark">#33FFFFFF</color>

core/res/res/values/public-staging.xml

+38 −24
Original line number Diff line number Diff line
@@ -191,18 +191,18 @@ 
    <public name="system_on_error_light" />

    <public name="system_error_container_light" />

    <public name="system_on_error_container_light" />

    <public name="system_primary_fixed_light" />

    <public name="system_primary_fixed_dim_light" />

    <public name="system_on_primary_fixed_light" />

    <public name="system_on_primary_fixed_variant_light" />

    <public name="system_secondary_fixed_light" />

    <public name="system_secondary_fixed_dim_light" />

    <public name="system_on_secondary_fixed_light" />

    <public name="system_on_secondary_fixed_variant_light" />

    <public name="system_tertiary_fixed_light" />

    <public name="system_tertiary_fixed_dim_light" />

    <public name="system_on_tertiary_fixed_light" />

    <public name="system_on_tertiary_fixed_variant_light" />

    <public name="removed_system_primary_fixed_light" />

    <public name="removed_system_primary_fixed_dim_light" />

    <public name="removed_system_on_primary_fixed_light" />

    <public name="removed_system_on_primary_fixed_variant_light" />

    <public name="removed_system_secondary_fixed_light" />

    <public name="removed_system_secondary_fixed_dim_light" />

    <public name="removed_system_on_secondary_fixed_light" />

    <public name="removed_system_on_secondary_fixed_variant_light" />

    <public name="removed_system_tertiary_fixed_light" />

    <public name="removed_system_tertiary_fixed_dim_light" />

    <public name="removed_system_on_tertiary_fixed_light" />

    <public name="removed_system_on_tertiary_fixed_variant_light" />

    <public name="system_control_activated_light" />

    <public name="system_control_normal_light" />

    <public name="system_control_highlight_light" />
@@ -246,18 +246,18 @@ 
    <public name="system_on_error_dark"/>

    <public name="system_error_container_dark"/>

    <public name="system_on_error_container_dark"/>

    <public name="system_primary_fixed_dark"/>

    <public name="system_primary_fixed_dim_dark"/>

    <public name="system_on_primary_fixed_dark"/>

    <public name="system_on_primary_fixed_variant_dark"/>

    <public name="system_secondary_fixed_dark"/>

    <public name="system_secondary_fixed_dim_dark"/>

    <public name="system_on_secondary_fixed_dark"/>

    <public name="system_on_secondary_fixed_variant_dark"/>

    <public name="system_tertiary_fixed_dark"/>

    <public name="system_tertiary_fixed_dim_dark"/>

    <public name="system_on_tertiary_fixed_dark"/>

    <public name="system_on_tertiary_fixed_variant_dark"/>

    <public name="removed_system_primary_fixed_dark"/>

    <public name="removed_system_primary_fixed_dim_dark"/>

    <public name="removed_system_on_primary_fixed_dark"/>

    <public name="removed_system_on_primary_fixed_variant_dark"/>

    <public name="removed_system_secondary_fixed_dark"/>

    <public name="removed_system_secondary_fixed_dim_dark"/>

    <public name="removed_system_on_secondary_fixed_dark"/>

    <public name="removed_system_on_secondary_fixed_variant_dark"/>

    <public name="removed_system_tertiary_fixed_dark"/>

    <public name="removed_system_tertiary_fixed_dim_dark"/>

    <public name="removed_system_on_tertiary_fixed_dark"/>

    <public name="removed_system_on_tertiary_fixed_variant_dark"/>

    <public name="system_control_activated_dark"/>

    <public name="system_control_normal_dark"/>

    <public name="system_control_highlight_dark"/>
@@ -271,6 +271,20 @@ 
    <public name="system_palette_key_color_tertiary_dark"/>

    <public name="system_palette_key_color_neutral_dark"/>

    <public name="system_palette_key_color_neutral_variant_dark"/>

    <public name="system_primary_fixed" />

    <public name="system_primary_fixed_dim" />

    <public name="system_on_primary_fixed" />

    <public name="system_on_primary_fixed_variant" />

    <public name="system_secondary_fixed" />

    <public name="system_secondary_fixed_dim" />

    <public name="system_on_secondary_fixed" />

    <public name="system_on_secondary_fixed_variant" />

    <public name="system_tertiary_fixed" />

    <public name="system_tertiary_fixed_dim" />

    <public name="system_on_tertiary_fixed" />

    <public name="system_on_tertiary_fixed_variant" />

    <public name="system_outline_variant_light" />

    <public name="system_outline_variant_dark" />

  </staging-public-group>



  <staging-public-group type="array" first-id="0x01c80000">

core/res/res/values/symbols.xml

+1 −2
Original line number Diff line number Diff line
@@ -4987,7 +4987,6 @@ 
  <java-symbol type="bool" name="config_batteryStatsResetOnUnplugHighBatteryLevel" />

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

  



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

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

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

core/res/res/values/themes_device_defaults.xml

+612 −642

File changed.

Preview size limit exceeded, changes collapsed.