Skip to content

Commit 4a841f5

Browse files
pekingmepaulfthomas
pekingme
authored and
paulfthomas
committed
[ExtendedFAB] Integrated new token sets.
PiperOrigin-RevId: 733904498
1 parent f7ba9c6 commit 4a841f5

File tree

4 files changed

+58
-56
lines changed

4 files changed

+58
-56
lines changed

‎lib/java/com/google/android/material/floatingactionbutton/res/animator/m3_extended_fab_state_list_animator.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<objectAnimator
2727
android:duration="@integer/mtrl_btn_anim_duration_ms"
2828
android:propertyName="translationZ"
29-
android:valueTo="@dimen/m3_comp_extended_fab_primary_pressed_container_elevation"
29+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_pressed_container_elevation"
3030
android:valueType="floatType"/>
3131
<objectAnimator
3232
android:duration="0"
3333
android:propertyName="elevation"
34-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
34+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_container_elevation"
3535
android:valueType="floatType"/>
3636
</set>
3737
</item>
@@ -44,12 +44,12 @@
4444
<objectAnimator
4545
android:duration="@integer/mtrl_btn_anim_duration_ms"
4646
android:propertyName="translationZ"
47-
android:valueTo="@dimen/m3_comp_extended_fab_primary_hover_container_elevation"
47+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_hovered_container_elevation"
4848
android:valueType="floatType"/>
4949
<objectAnimator
5050
android:duration="0"
5151
android:propertyName="elevation"
52-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
52+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_container_elevation"
5353
android:valueType="floatType"/>
5454
</set>
5555
</item>
@@ -62,12 +62,12 @@
6262
<objectAnimator
6363
android:duration="@integer/mtrl_btn_anim_duration_ms"
6464
android:propertyName="translationZ"
65-
android:valueTo="@dimen/m3_comp_extended_fab_primary_focus_container_elevation"
65+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_focused_container_elevation"
6666
android:valueType="floatType"/>
6767
<objectAnimator
6868
android:duration="0"
6969
android:propertyName="elevation"
70-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
70+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_container_elevation"
7171
android:valueType="floatType"/>
7272
</set>
7373
</item>
@@ -84,7 +84,7 @@
8484
<objectAnimator
8585
android:duration="0"
8686
android:propertyName="elevation"
87-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
87+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_container_elevation"
8888
android:valueType="floatType"/>
8989
</set>
9090
</item>

‎lib/java/com/google/android/material/floatingactionbutton/res/color/m3_efab_ripple_color_selector.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
~ limitations under the License.
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18-
<item android:alpha="@dimen/m3_comp_extended_fab_primary_pressed_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_pressed="true"/>
19-
<item android:alpha="@dimen/m3_comp_extended_fab_primary_focus_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_focused="true"/>
20-
<item android:alpha="@dimen/m3_comp_extended_fab_primary_hover_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_hovered="true"/>
18+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_container_pressed_state_layer_opacity"
19+
android:color="?attr/colorOnContainer" android:state_pressed="true"/>
20+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_container_focused_state_layer_opacity"
21+
android:color="?attr/colorOnContainer" android:state_focused="true"/>
22+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_container_hovered_state_layer_opacity"
23+
android:color="?attr/colorOnContainer" android:state_hovered="true"/>
2124
<item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnContainer"/>
2225
</selector>

‎lib/java/com/google/android/material/floatingactionbutton/res/values/efab_tokens.xml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,45 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: 6.1.0 (LOCKED) -->
19-
<!-- NOT BEING UPGRADED DUE TO PENDING MIGRATION. -->
18+
<!-- Version: 15.0.26 -->
2019

2120
<resources>
2221

23-
<!-- Generated from token set (md.comp.extended-fab.primary) in context (platform=android, audience=3p). -->
24-
<!-- Group: Enabled - Container -->
25-
<macro name="m3_comp_extended_fab_primary_container_color">?attr/colorPrimaryContainer</macro>
26-
<macro name="m3_comp_extended_fab_primary_container_shape">?attr/shapeAppearanceCornerLarge</macro>
27-
<dimen name="m3_comp_extended_fab_primary_container_height">56dp</dimen>
28-
<dimen name="m3_comp_extended_fab_primary_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
29-
<!-- Group: Enabled - Label text -->
30-
<macro name="m3_comp_extended_fab_primary_label_text_type">?attr/textAppearanceLabelLarge</macro>
31-
<!-- Group: Enabled - Icon -->
32-
<dimen name="m3_comp_extended_fab_primary_icon_size">24dp</dimen>
33-
<macro name="m3_comp_extended_fab_primary_icon_color">?attr/colorOnPrimaryContainer</macro>
34-
<!-- Group: Hovered - Container -->
35-
<dimen name="m3_comp_extended_fab_primary_hover_container_elevation">@dimen/m3_sys_elevation_level4</dimen>
36-
<!-- Group: Hovered - State layer -->
37-
<dimen name="m3_comp_extended_fab_primary_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
38-
<!-- Group: Focused - Container -->
39-
<dimen name="m3_comp_extended_fab_primary_focus_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
40-
<!-- Group: Focused - State layer -->
41-
<dimen name="m3_comp_extended_fab_primary_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
42-
<!-- Group: Pressed (ripple) - Container -->
43-
<dimen name="m3_comp_extended_fab_primary_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
44-
<!-- Group: Pressed (ripple) - State layer -->
45-
<dimen name="m3_comp_extended_fab_primary_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
22+
<!-- Generated from token set (md.comp.extended-fab.small) in context (platform=android, audience=3p). -->
23+
<dimen name="m3_comp_extended_fab_small_container_height">56dp</dimen>
24+
<!-- The resource value ?attr/textAppearanceTitleMedium has been overridden by the config. -->
25+
<macro name="m3_comp_extended_fab_small_label_text">?attr/textAppearanceLabelLarge</macro>
26+
<dimen name="m3_comp_extended_fab_small_icon_size">24dp</dimen>
27+
<macro name="m3_comp_extended_fab_small_container_shape">?attr/shapeAppearanceCornerLarge</macro>
4628

47-
<!-- Generated from token set (md.comp.extended-fab.secondary) in context (platform=android, audience=3p). -->
48-
<!-- Group: Enabled - Container -->
49-
<macro name="m3_comp_extended_fab_secondary_container_color">?attr/colorSecondaryContainer</macro>
50-
<!-- Group: Enabled - Icon -->
51-
<macro name="m3_comp_extended_fab_secondary_icon_color">?attr/colorOnSecondaryContainer</macro>
29+
<!-- Generated from token set (md.comp.extended-fab.primary-container) in context (platform=android,
30+
audience=3p). -->
31+
<!-- Group: Enabled -->
32+
<macro name="m3_comp_extended_fab_primary_container_container_color">?attr/colorPrimaryContainer</macro>
33+
<dimen name="m3_comp_extended_fab_primary_container_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
34+
<macro name="m3_comp_extended_fab_primary_container_icon_color">?attr/colorOnPrimaryContainer</macro>
35+
<!-- Group: Hovered -->
36+
<dimen name="m3_comp_extended_fab_primary_container_hovered_container_elevation">@dimen/m3_sys_elevation_level4</dimen>
37+
<dimen name="m3_comp_extended_fab_primary_container_hovered_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
38+
<!-- Group: Focused -->
39+
<dimen name="m3_comp_extended_fab_primary_container_focused_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
40+
<dimen name="m3_comp_extended_fab_primary_container_focused_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
41+
<!-- Group: Pressed -->
42+
<dimen name="m3_comp_extended_fab_primary_container_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
43+
<dimen name="m3_comp_extended_fab_primary_container_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
5244

53-
<!-- Generated from token set (md.comp.extended-fab.tertiary) in context (platform=android, audience=3p). -->
54-
<!-- Group: Enabled - Container -->
55-
<macro name="m3_comp_extended_fab_tertiary_container_color">?attr/colorTertiaryContainer</macro>
56-
<!-- Group: Enabled - Icon -->
57-
<macro name="m3_comp_extended_fab_tertiary_icon_color">?attr/colorOnTertiaryContainer</macro>
45+
<!-- Generated from token set (md.comp.extended-fab.secondary-container) in context (platform=android,
46+
audience=3p). -->
47+
<!-- Group: Enabled -->
48+
<macro name="m3_comp_extended_fab_secondary_container_container_color">?attr/colorSecondaryContainer</macro>
49+
<!-- The resource value ?attr/colorSecondaryContainer has been overridden by the config. -->
50+
<macro name="m3_comp_extended_fab_secondary_container_icon_color">?attr/colorOnSecondaryContainer</macro>
51+
52+
<!-- Generated from token set (md.comp.extended-fab.tertiary-container) in context (platform=android,
53+
audience=3p). -->
54+
<!-- Group: Enabled -->
55+
<macro name="m3_comp_extended_fab_tertiary_container_container_color">?attr/colorTertiaryContainer</macro>
56+
<macro name="m3_comp_extended_fab_tertiary_container_icon_color">?attr/colorOnTertiaryContainer</macro>
5857

5958
<!-- Generated from token set (md.comp.extended-fab.surface) in context (platform=android, audience=3p). -->
6059
<!-- Group: Enabled - Container -->

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@
217217
<item name="iconTint">@color/m3_fab_efab_foreground_color_selector</item>
218218
<item name="android:textColor">@color/m3_fab_efab_foreground_color_selector</item>
219219
<item name="rippleColor">@color/m3_efab_ripple_color_selector</item>
220-
<item name="android:minHeight">@dimen/m3_comp_extended_fab_primary_container_height</item>
221-
<item name="elevation">@dimen/m3_comp_extended_fab_primary_container_elevation</item>
220+
<item name="android:minHeight">@dimen/m3_comp_extended_fab_small_container_height</item>
221+
<item name="elevation">@dimen/m3_comp_extended_fab_primary_container_container_elevation</item>
222222
<item name="android:stateListAnimator">@animator/m3_extended_fab_state_list_animator</item>
223-
<item name="iconSize">@dimen/m3_comp_extended_fab_primary_icon_size</item>
224-
<item name="android:textAppearance">@macro/m3_comp_extended_fab_primary_label_text_type</item>
225-
<item name="shapeAppearance">@macro/m3_comp_extended_fab_primary_container_shape</item>
223+
<item name="iconSize">@dimen/m3_comp_extended_fab_small_icon_size</item>
224+
<item name="android:textAppearance">@macro/m3_comp_extended_fab_small_label_text</item>
225+
<item name="shapeAppearance">@macro/m3_comp_extended_fab_small_container_shape</item>
226226
<item name="shapeAppearanceOverlay">@null</item>
227227
<item name="enforceMaterialTheme">true</item>
228228
<item name="showMotionSpec">@animator/m3_extended_fab_show_motion_spec</item>
@@ -278,18 +278,18 @@
278278
<!-- Extended FAB Overlays -->
279279

280280
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary" parent="">
281-
<item name="colorContainer">@macro/m3_comp_extended_fab_primary_container_color</item>
282-
<item name="colorOnContainer">@macro/m3_comp_extended_fab_primary_icon_color</item>
281+
<item name="colorContainer">@macro/m3_comp_extended_fab_primary_container_container_color</item>
282+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_primary_container_icon_color</item>
283283
</style>
284284

285285
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Secondary" parent="">
286-
<item name="colorContainer">@macro/m3_comp_extended_fab_secondary_container_color</item>
287-
<item name="colorOnContainer">@macro/m3_comp_extended_fab_secondary_icon_color</item>
286+
<item name="colorContainer">@macro/m3_comp_extended_fab_secondary_container_container_color</item>
287+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_secondary_container_icon_color</item>
288288
</style>
289289

290290
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Tertiary" parent="">
291-
<item name="colorContainer">@macro/m3_comp_extended_fab_tertiary_container_color</item>
292-
<item name="colorOnContainer">@macro/m3_comp_extended_fab_tertiary_icon_color</item>
291+
<item name="colorContainer">@macro/m3_comp_extended_fab_tertiary_container_container_color</item>
292+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_tertiary_container_icon_color</item>
293293
</style>
294294

295295
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface" parent="">

0 commit comments

Comments
 (0)