Merge "Revert "Remove _light / _dark / from "fixed" sys resources"" into udc-dev am: 5c3928ac91

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

Change-Id: I63d6472958fba83b2ede81b1a60f7fa4ebfc915d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/api/current.txt

@@ -2014,14 +2014,18 @@ 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;
+    field public static final int system_on_primary_fixed_dark;
-    field public static final int system_on_primary_fixed_variant;
+    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_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;
+    field public static final int system_on_secondary_fixed_dark;
-    field public static final int system_on_secondary_fixed_variant;
+    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_light;
     field public static final int system_on_surface_dark;
     field public static final int system_on_surface_light;
@@ -2030,8 +2034,10 @@ 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;
+    field public static final int system_on_tertiary_fixed_dark;
-    field public static final int system_on_tertiary_fixed_variant;
+    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_light;
     field public static final int system_outline_dark;
     field public static final int system_outline_light;
@@ -2048,14 +2054,18 @@ 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;
+    field public static final int system_primary_fixed_dark;
-    field public static final int system_primary_fixed_dim;
+    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_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;
+    field public static final int system_secondary_fixed_dark;
-    field public static final int system_secondary_fixed_dim;
+    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_light;
     field public static final int system_surface_bright_dark;
     field public static final int system_surface_bright_light;
@@ -2078,8 +2088,10 @@ 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;
+    field public static final int system_tertiary_fixed_dark;
-    field public static final int system_tertiary_fixed_dim;
+    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_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

@@ -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">#D8E2FF</color>
+    <color name="system_primary_fixed_light">#D8E2FF</color>
-    <color name="system_primary_fixed_dim">#ADC6FF</color>
+    <color name="system_primary_fixed_dim_light">#ADC6FF</color>
-    <color name="system_on_primary_fixed">#001A41</color>
+    <color name="system_on_primary_fixed_light">#001A41</color>
-    <color name="system_on_primary_fixed_variant">#2B4678</color>
+    <color name="system_on_primary_fixed_variant_light">#2B4678</color>
-    <color name="system_secondary_fixed">#DBE2F9</color>
+    <color name="system_secondary_fixed_light">#DBE2F9</color>
-    <color name="system_secondary_fixed_dim">#BFC6DC</color>
+    <color name="system_secondary_fixed_dim_light">#BFC6DC</color>
-    <color name="system_on_secondary_fixed">#141B2C</color>
+    <color name="system_on_secondary_fixed_light">#141B2C</color>
-    <color name="system_on_secondary_fixed_variant">#3F4759</color>
+    <color name="system_on_secondary_fixed_variant_light">#3F4759</color>
-    <color name="system_tertiary_fixed">#FBD7FC</color>
+    <color name="system_tertiary_fixed_light">#FBD7FC</color>
-    <color name="system_tertiary_fixed_dim">#DEBCDF</color>
+    <color name="system_tertiary_fixed_dim_light">#DEBCDF</color>
-    <color name="system_on_tertiary_fixed">#29132D</color>
+    <color name="system_on_tertiary_fixed_light">#29132D</color>
-    <color name="system_on_tertiary_fixed_variant">#583E5B</color>
+    <color name="system_on_tertiary_fixed_variant_light">#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,6 +524,18 @@
     <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

@@ -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="removed_system_primary_fixed_light" />
+    <public name="system_primary_fixed_light" />
-    <public name="removed_system_primary_fixed_dim_light" />
+    <public name="system_primary_fixed_dim_light" />
-    <public name="removed_system_on_primary_fixed_light" />
+    <public name="system_on_primary_fixed_light" />
-    <public name="removed_system_on_primary_fixed_variant_light" />
+    <public name="system_on_primary_fixed_variant_light" />
-    <public name="removed_system_secondary_fixed_light" />
+    <public name="system_secondary_fixed_light" />
-    <public name="removed_system_secondary_fixed_dim_light" />
+    <public name="system_secondary_fixed_dim_light" />
-    <public name="removed_system_on_secondary_fixed_light" />
+    <public name="system_on_secondary_fixed_light" />
-    <public name="removed_system_on_secondary_fixed_variant_light" />
+    <public name="system_on_secondary_fixed_variant_light" />
-    <public name="removed_system_tertiary_fixed_light" />
+    <public name="system_tertiary_fixed_light" />
-    <public name="removed_system_tertiary_fixed_dim_light" />
+    <public name="system_tertiary_fixed_dim_light" />
-    <public name="removed_system_on_tertiary_fixed_light" />
+    <public name="system_on_tertiary_fixed_light" />
-    <public name="removed_system_on_tertiary_fixed_variant_light" />
+    <public name="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="removed_system_primary_fixed_dark"/>
+    <public name="system_primary_fixed_dark"/>
-    <public name="removed_system_primary_fixed_dim_dark"/>
+    <public name="system_primary_fixed_dim_dark"/>
-    <public name="removed_system_on_primary_fixed_dark"/>
+    <public name="system_on_primary_fixed_dark"/>
-    <public name="removed_system_on_primary_fixed_variant_dark"/>
+    <public name="system_on_primary_fixed_variant_dark"/>
-    <public name="removed_system_secondary_fixed_dark"/>
+    <public name="system_secondary_fixed_dark"/>
-    <public name="removed_system_secondary_fixed_dim_dark"/>
+    <public name="system_secondary_fixed_dim_dark"/>
-    <public name="removed_system_on_secondary_fixed_dark"/>
+    <public name="system_on_secondary_fixed_dark"/>
-    <public name="removed_system_on_secondary_fixed_variant_dark"/>
+    <public name="system_on_secondary_fixed_variant_dark"/>
-    <public name="removed_system_tertiary_fixed_dark"/>
+    <public name="system_tertiary_fixed_dark"/>
-    <public name="removed_system_tertiary_fixed_dim_dark"/>
+    <public name="system_tertiary_fixed_dim_dark"/>
-    <public name="removed_system_on_tertiary_fixed_dark"/>
+    <public name="system_on_tertiary_fixed_dark"/>
-    <public name="removed_system_on_tertiary_fixed_variant_dark"/>
+    <public name="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,18 +271,6 @@
     <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>

core/res/res/values/symbols.xml

@@ -4987,6 +4987,7 @@
   <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"/>