Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Remove _light / _dark / from "fixed" sys resources"" into udc-dev

Browse Source
This commit is contained in:
Winson Chiu
2023-03-23 16:58:33 +00:00
committed by Android (Google) Code Review
parent b6b1ac222c f819fa850b
commit 55d969039e
5 changed files with 673 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/api/current.txt
View File

@@ -2015,18 +2015,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;
@@ -2035,10 +2031,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;
@@ -2057,18 +2051,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;
@@ -2091,10 +2081,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;

36
core/res/res/values/colors.xml
View File

@@ -470,18 +470,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>
@@ -526,18 +526,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>

60
core/res/res/values/public-staging.xml
View File

@@ -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,18 @@
<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>

3
core/res/res/values/symbols.xml
View File

@@ -4991,8 +4991,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"/>

1254
core/res/res/values/themes_device_defaults.xml
View File

File diff suppressed because it is too large Load Diff