Skip to content

Commit a2b9322

Browse files
pekingmekendrickumstattd
authored andcommitted
[Color] Overloaded on-container colors in light theme for V+ to match the tone with system dynamic colors.
PiperOrigin-RevId: 644428365
1 parent 34adcb0 commit a2b9322

File tree

3 files changed

+44
-0
lines changed

3 files changed

+44
-0
lines changed

lib/java/com/google/android/material/color/res/values-v31/tokens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,19 @@
7474
<color name="m3_sys_color_dynamic_light_primary">@color/m3_ref_palette_dynamic_primary40</color>
7575
<color name="m3_sys_color_dynamic_light_on_primary">@color/m3_ref_palette_dynamic_primary100</color>
7676
<color name="m3_sys_color_dynamic_light_primary_container">@color/m3_ref_palette_dynamic_primary90</color>
77+
<!-- The resource value @color/m3_ref_palette_dynamic_primary10 has been overridden by the config. -->
7778
<color name="m3_sys_color_dynamic_light_on_primary_container">@color/m3_ref_palette_dynamic_primary10</color>
7879
<!-- Group: Secondary colors -->
7980
<color name="m3_sys_color_dynamic_light_secondary">@color/m3_ref_palette_dynamic_secondary40</color>
8081
<color name="m3_sys_color_dynamic_light_on_secondary">@color/m3_ref_palette_dynamic_secondary100</color>
8182
<color name="m3_sys_color_dynamic_light_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
83+
<!-- The resource value @color/m3_ref_palette_dynamic_secondary10 has been overridden by the config. -->
8284
<color name="m3_sys_color_dynamic_light_on_secondary_container">@color/m3_ref_palette_dynamic_secondary10</color>
8385
<!-- Group: Tertiary colors -->
8486
<color name="m3_sys_color_dynamic_light_tertiary">@color/m3_ref_palette_dynamic_tertiary40</color>
8587
<color name="m3_sys_color_dynamic_light_on_tertiary">@color/m3_ref_palette_dynamic_tertiary100</color>
8688
<color name="m3_sys_color_dynamic_light_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
89+
<!-- The resource value @color/m3_ref_palette_dynamic_tertiary10 has been overridden by the config. -->
8790
<color name="m3_sys_color_dynamic_light_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary10</color>
8891
<!-- Group: Surface colors -->
8992
<!-- The resource value @color/m3_ref_palette_dynamic_neutral98 has been overridden by the config. -->
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2024 The Android Open Source Project
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18+
<!-- Version: 4.0.0 -->
19+
20+
<resources>
21+
22+
<!-- Generated from token set (md.sys.color) in context (theme=light, platform=android, audience=3p,
23+
scheme=non-dynamic). -->
24+
<!-- Group: Primary colors -->
25+
<!-- The resource value @color/m3_ref_palette_primary10 has been overridden by the config. -->
26+
<color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary30</color>
27+
<!-- Group: Secondary colors -->
28+
<!-- The resource value @color/m3_ref_palette_secondary10 has been overridden by the config. -->
29+
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary30</color>
30+
<!-- Group: Tertiary colors -->
31+
<!-- The resource value @color/m3_ref_palette_tertiary10 has been overridden by the config. -->
32+
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary30</color>
33+
<!-- Group: Error colors -->
34+
<!-- The resource value @color/m3_ref_palette_error10 has been overridden by the config. -->
35+
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error30</color>
36+
37+
</resources>

lib/java/com/google/android/material/color/res/values/tokens.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,25 @@
7171
<color name="m3_sys_color_light_primary">@color/m3_ref_palette_primary40</color>
7272
<color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
7373
<color name="m3_sys_color_light_primary_container">@color/m3_ref_palette_primary90</color>
74+
<!-- The resource value @color/m3_ref_palette_primary10 has been overridden by the config. -->
7475
<color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary10</color>
7576
<!-- Group: Secondary colors -->
7677
<color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
7778
<color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
7879
<color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
80+
<!-- The resource value @color/m3_ref_palette_secondary10 has been overridden by the config. -->
7981
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
8082
<!-- Group: Tertiary colors -->
8183
<color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
8284
<color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
8385
<color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
86+
<!-- The resource value @color/m3_ref_palette_tertiary10 has been overridden by the config. -->
8487
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
8588
<!-- Group: Error colors -->
8689
<color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
8790
<color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
8891
<color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
92+
<!-- The resource value @color/m3_ref_palette_error10 has been overridden by the config. -->
8993
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
9094
<!-- Group: Surface colors -->
9195
<color name="m3_sys_color_light_surface">@color/m3_ref_palette_neutral98</color>

0 commit comments

Comments
 (0)