Skip to content

Commit

Permalink
[Token][Color] Upgraded to v0.170 for tonal surface colors.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 555230534
  • Loading branch information
pekingme authored and dsn5ft committed Aug 9, 2023
1 parent 6c2dd5d commit 8204856
Show file tree
Hide file tree
Showing 70 changed files with 400 additions and 191 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
<style name="Widget.Material3.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
<item name="liftOnScroll">true</item>
<item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="liftOnScrollColor">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="android:stateListAnimator" tools:ignore="NewApi">
@animator/m3_appbar_state_list_animator
</item>
Expand Down Expand Up @@ -235,28 +236,28 @@
<style name="Base.Widget.Material3.ActionBar.Solid" parent="Widget.AppCompat.ActionBar.Solid">
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
</style>

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

<style name="Base.Widget.Material3.Light.ActionBar.Solid" parent="Widget.AppCompat.Light.ActionBar.Solid">
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
</style>

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

<style name="Base.Widget.Material3.ActionMode" parent="Widget.AppCompat.ActionMode">
<item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
<item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
<item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
<item name="background">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
<item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_on_scroll_container_color</item>
</style>

<style name="Widget.Material3.ActionMode" parent="Base.Widget.Material3.ActionMode" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

<!-- Generated from token set (md.comp.top-app-bar.small) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<macro name="m3_comp_top_app_bar_small_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_top_app_bar_small_on_scroll_container_color">?attr/colorSurfaceContainer</macro>
<dimen name="m3_comp_top_app_bar_small_container_height">64dp</dimen>
<dimen name="m3_comp_top_app_bar_small_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<!-- Enabled - Leading icon -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

<!-- Generated from token set (md.comp.bottom-app-bar) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<macro name="m3_comp_bottom_app_bar_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_bottom_app_bar_container_color">?attr/colorSurfaceContainer</macro>
<style name="ShapeAppearance.M3.Comp.BottomAppBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
<dimen name="m3_comp_bottom_app_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
<dimen name="m3_comp_bottom_app_bar_container_height">80dp</dimen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

<!-- Generated from token set (md.comp.navigation-bar) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurfaceContainer</macro>
<style name="ShapeAppearance.M3.Comp.NavigationBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
<dimen name="m3_comp_navigation_bar_container_height">80dp</dimen>
<dimen name="m3_comp_navigation_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

<!-- Generated from token set (md.comp.sheet.bottom) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurfaceContainerLow</macro>
<dimen name="m3_comp_sheet_bottom_docked_modal_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<dimen name="m3_comp_sheet_bottom_docked_standard_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<!-- Please use the resource below in shapeAppearance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

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

<!-- Generated from token set (md.comp.elevated-card) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<macro name="m3_comp_elevated_card_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_elevated_card_container_color">?attr/colorSurfaceContainerLow</macro>
<dimen name="m3_comp_elevated_card_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<macro name="m3_comp_elevated_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
<!-- Enabled - Icon -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<resources>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="12"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="17"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="22"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="24"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="4"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="6"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="87"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="92"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="94"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="96"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.162 -->
<!-- Version: v0.170 -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral1_600" android:lStar="98"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_600" android:lStar="12"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_600" android:lStar="17"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_600" android:lStar="22"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_600" android:lStar="24"/>
</selector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2023 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_600" android:lStar="4"/>
</selector>
Loading

0 comments on commit 8204856

Please sign in to comment.