Skip to content

Commit

Permalink
[Color] Overloaded on-container colors in light theme for V+ to match…
Browse files Browse the repository at this point in the history
… the tone with system dynamic colors.

PiperOrigin-RevId: 644428365
  • Loading branch information
pekingme authored and kendrickumstattd committed Jun 20, 2024
1 parent 34adcb0 commit a2b9322
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,19 @@
<color name="m3_sys_color_dynamic_light_primary">@color/m3_ref_palette_dynamic_primary40</color>
<color name="m3_sys_color_dynamic_light_on_primary">@color/m3_ref_palette_dynamic_primary100</color>
<color name="m3_sys_color_dynamic_light_primary_container">@color/m3_ref_palette_dynamic_primary90</color>
<!-- The resource value @color/m3_ref_palette_dynamic_primary10 has been overridden by the config. -->
<color name="m3_sys_color_dynamic_light_on_primary_container">@color/m3_ref_palette_dynamic_primary10</color>
<!-- Group: Secondary colors -->
<color name="m3_sys_color_dynamic_light_secondary">@color/m3_ref_palette_dynamic_secondary40</color>
<color name="m3_sys_color_dynamic_light_on_secondary">@color/m3_ref_palette_dynamic_secondary100</color>
<color name="m3_sys_color_dynamic_light_secondary_container">@color/m3_ref_palette_dynamic_secondary90</color>
<!-- The resource value @color/m3_ref_palette_dynamic_secondary10 has been overridden by the config. -->
<color name="m3_sys_color_dynamic_light_on_secondary_container">@color/m3_ref_palette_dynamic_secondary10</color>
<!-- Group: Tertiary colors -->
<color name="m3_sys_color_dynamic_light_tertiary">@color/m3_ref_palette_dynamic_tertiary40</color>
<color name="m3_sys_color_dynamic_light_on_tertiary">@color/m3_ref_palette_dynamic_tertiary100</color>
<color name="m3_sys_color_dynamic_light_tertiary_container">@color/m3_ref_palette_dynamic_tertiary90</color>
<!-- The resource value @color/m3_ref_palette_dynamic_tertiary10 has been overridden by the config. -->
<color name="m3_sys_color_dynamic_light_on_tertiary_container">@color/m3_ref_palette_dynamic_tertiary10</color>
<!-- Group: Surface colors -->
<!-- The resource value @color/m3_ref_palette_dynamic_neutral98 has been overridden by the config. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: 4.0.0 -->

<resources>

<!-- Generated from token set (md.sys.color) in context (theme=light, platform=android, audience=3p,
scheme=non-dynamic). -->
<!-- Group: Primary colors -->
<!-- The resource value @color/m3_ref_palette_primary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary30</color>
<!-- Group: Secondary colors -->
<!-- The resource value @color/m3_ref_palette_secondary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary30</color>
<!-- Group: Tertiary colors -->
<!-- The resource value @color/m3_ref_palette_tertiary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary30</color>
<!-- Group: Error colors -->
<!-- The resource value @color/m3_ref_palette_error10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error30</color>

</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,25 @@
<color name="m3_sys_color_light_primary">@color/m3_ref_palette_primary40</color>
<color name="m3_sys_color_light_on_primary">@color/m3_ref_palette_primary100</color>
<color name="m3_sys_color_light_primary_container">@color/m3_ref_palette_primary90</color>
<!-- The resource value @color/m3_ref_palette_primary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_primary_container">@color/m3_ref_palette_primary10</color>
<!-- Group: Secondary colors -->
<color name="m3_sys_color_light_secondary">@color/m3_ref_palette_secondary40</color>
<color name="m3_sys_color_light_on_secondary">@color/m3_ref_palette_secondary100</color>
<color name="m3_sys_color_light_secondary_container">@color/m3_ref_palette_secondary90</color>
<!-- The resource value @color/m3_ref_palette_secondary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_secondary_container">@color/m3_ref_palette_secondary10</color>
<!-- Group: Tertiary colors -->
<color name="m3_sys_color_light_tertiary">@color/m3_ref_palette_tertiary40</color>
<color name="m3_sys_color_light_on_tertiary">@color/m3_ref_palette_tertiary100</color>
<color name="m3_sys_color_light_tertiary_container">@color/m3_ref_palette_tertiary90</color>
<!-- The resource value @color/m3_ref_palette_tertiary10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_tertiary_container">@color/m3_ref_palette_tertiary10</color>
<!-- Group: Error colors -->
<color name="m3_sys_color_light_error">@color/m3_ref_palette_error40</color>
<color name="m3_sys_color_light_on_error">@color/m3_ref_palette_error100</color>
<color name="m3_sys_color_light_error_container">@color/m3_ref_palette_error90</color>
<!-- The resource value @color/m3_ref_palette_error10 has been overridden by the config. -->
<color name="m3_sys_color_light_on_error_container">@color/m3_ref_palette_error10</color>
<!-- Group: Surface colors -->
<color name="m3_sys_color_light_surface">@color/m3_ref_palette_neutral98</color>
Expand Down

0 comments on commit a2b9322

Please sign in to comment.