Skip to content

Commit 8204856

Browse files
pekingmedsn5ft
authored andcommitted
[Token][Color] Upgraded to v0.170 for tonal surface colors.
PiperOrigin-RevId: 555230534
1 parent 6c2dd5d commit 8204856

File tree

70 files changed

+400
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+400
-191
lines changed

lib/java/com/google/android/material/appbar/res/values/styles.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
<style name="Widget.Material3.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
151151
<item name="liftOnScroll">true</item>
152152
<item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
153+
<item name="liftOnScrollColor">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
153154
<item name="android:stateListAnimator" tools:ignore="NewApi">
154155
@animator/m3_appbar_state_list_animator
155156
</item>
@@ -235,28 +236,28 @@
235236
<style name="Base.Widget.Material3.ActionBar.Solid" parent="Widget.AppCompat.ActionBar.Solid">
236237
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
237238
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
238-
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
239-
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
240-
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
239+
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
240+
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
241+
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
241242
</style>
242243

243244
<style name="Widget.Material3.ActionBar.Solid" parent="Base.Widget.Material3.ActionBar.Solid" />
244245

245246
<style name="Base.Widget.Material3.Light.ActionBar.Solid" parent="Widget.AppCompat.Light.ActionBar.Solid">
246247
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
247248
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
248-
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
249-
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
250-
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
249+
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
250+
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
251+
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
251252
</style>
252253

253254
<style name="Widget.Material3.Light.ActionBar.Solid" parent="Base.Widget.Material3.Light.ActionBar.Solid" />
254255

255256
<style name="Base.Widget.Material3.ActionMode" parent="Widget.AppCompat.ActionMode">
256257
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
257258
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
258-
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
259-
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
259+
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
260+
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
260261
</style>
261262

262263
<style name="Widget.Material3.ActionMode" parent="Base.Widget.Material3.ActionMode" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

2222
<!-- Generated from token set (md.comp.top-app-bar.small) in context (platform=android, audience=3p). -->
2323
<!-- Enabled - Container -->
2424
<macro name="m3_comp_top_app_bar_small_container_color">?attr/colorSurface</macro>
25+
<macro name="m3_comp_top_app_bar_small_on_scroll_container_color">?attr/colorSurfaceContainer</macro>
2526
<dimen name="m3_comp_top_app_bar_small_container_height">64dp</dimen>
2627
<dimen name="m3_comp_top_app_bar_small_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
2728
<!-- Enabled - Leading icon -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

2222
<!-- Generated from token set (md.comp.bottom-app-bar) in context (platform=android, audience=3p). -->
2323
<!-- Enabled - Container -->
24-
<macro name="m3_comp_bottom_app_bar_container_color">?attr/colorSurface</macro>
24+
<macro name="m3_comp_bottom_app_bar_container_color">?attr/colorSurfaceContainer</macro>
2525
<style name="ShapeAppearance.M3.Comp.BottomAppBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
2626
<dimen name="m3_comp_bottom_app_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
2727
<dimen name="m3_comp_bottom_app_bar_container_height">80dp</dimen>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

2222
<!-- Generated from token set (md.comp.navigation-bar) in context (platform=android, audience=3p). -->
2323
<!-- Enabled - Container -->
24-
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurface</macro>
24+
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurfaceContainer</macro>
2525
<style name="ShapeAppearance.M3.Comp.NavigationBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
2626
<dimen name="m3_comp_navigation_bar_container_height">80dp</dimen>
2727
<dimen name="m3_comp_navigation_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

2222
<!-- Generated from token set (md.comp.sheet.bottom) in context (platform=android, audience=3p). -->
2323
<!-- Enabled - Container -->
24-
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurface</macro>
24+
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurfaceContainerLow</macro>
2525
<dimen name="m3_comp_sheet_bottom_docked_modal_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
2626
<dimen name="m3_comp_sheet_bottom_docked_standard_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
2727
<!-- Please use the resource below in shapeAppearance

lib/java/com/google/android/material/button/res/values/icon_btn_tokens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

@@ -69,7 +69,7 @@
6969
<!-- Generated from token set (md.comp.elevated-button) in context (platform=android, audience=3p). -->
7070
<!-- Enabled - Container -->
7171
<dimen name="m3_comp_elevated_button_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
72-
<macro name="m3_comp_elevated_button_container_color">?attr/colorSurface</macro>
72+
<macro name="m3_comp_elevated_button_container_color">?attr/colorSurfaceContainerLow</macro>
7373
<!-- Disabled - Container -->
7474
<dimen name="m3_comp_elevated_button_disabled_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
7575

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

2222
<!-- Generated from token set (md.comp.filled-card) in context (platform=android, audience=3p). -->
2323
<!-- Enabled - Container -->
24-
<macro name="m3_comp_filled_card_container_color">?attr/colorSurfaceVariant</macro>
24+
<macro name="m3_comp_filled_card_container_color">?attr/colorSurfaceContainerHighest</macro>
2525
<dimen name="m3_comp_filled_card_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
2626
<macro name="m3_comp_filled_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
2727
<!-- Enabled - Icon -->
@@ -59,7 +59,7 @@
5959

6060
<!-- Generated from token set (md.comp.elevated-card) in context (platform=android, audience=3p). -->
6161
<!-- Enabled - Container -->
62-
<macro name="m3_comp_elevated_card_container_color">?attr/colorSurface</macro>
62+
<macro name="m3_comp_elevated_card_container_color">?attr/colorSurfaceContainerLow</macro>
6363
<dimen name="m3_comp_elevated_card_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
6464
<macro name="m3_comp_elevated_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
6565
<!-- Enabled - Icon -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: v0.162 -->
18+
<!-- Version: v0.170 -->
1919

2020
<resources>
2121

0 commit comments

Comments
 (0)