Skip to content

Commit db7fe20

Browse files
pekingmepaulfthomas
authored andcommitted
[ExtendedFAB] Fixed wrong elevation per state.
PiperOrigin-RevId: 735422734
1 parent da442be commit db7fe20

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<objectAnimator
2727
android:duration="@integer/mtrl_btn_anim_duration_ms"
2828
android:propertyName="translationZ"
29-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_pressed_container_elevation"
29+
android:valueTo="@dimen/m3_extended_fab_translation_z_pressed"
3030
android:valueType="floatType"/>
3131
<objectAnimator
3232
android:duration="0"
@@ -44,7 +44,7 @@
4444
<objectAnimator
4545
android:duration="@integer/mtrl_btn_anim_duration_ms"
4646
android:propertyName="translationZ"
47-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_hovered_container_elevation"
47+
android:valueTo="@dimen/m3_extended_fab_translation_z_hovered"
4848
android:valueType="floatType"/>
4949
<objectAnimator
5050
android:duration="0"
@@ -62,7 +62,7 @@
6262
<objectAnimator
6363
android:duration="@integer/mtrl_btn_anim_duration_ms"
6464
android:propertyName="translationZ"
65-
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_focused_container_elevation"
65+
android:valueTo="@dimen/m3_extended_fab_translation_z_focused"
6666
android:valueType="floatType"/>
6767
<objectAnimator
6868
android:duration="0"
@@ -79,7 +79,7 @@
7979
android:duration="@integer/mtrl_btn_anim_duration_ms"
8080
android:propertyName="translationZ"
8181
android:startDelay="@integer/mtrl_btn_anim_delay_ms"
82-
android:valueTo="@dimen/mtrl_extended_fab_translation_z_base"
82+
android:valueTo="@dimen/m3_extended_fab_translation_z_base"
8383
android:valueType="floatType"/>
8484
<objectAnimator
8585
android:duration="0"
@@ -95,12 +95,12 @@
9595
<objectAnimator
9696
android:duration="0"
9797
android:propertyName="translationZ"
98-
android:valueTo="@dimen/mtrl_extended_fab_disabled_translation_z"
98+
android:valueTo="@dimen/m3_extended_fab_disabled_translation_z"
9999
android:valueType="floatType"/>
100100
<objectAnimator
101101
android:duration="0"
102102
android:propertyName="elevation"
103-
android:valueTo="@dimen/mtrl_extended_fab_disabled_elevation"
103+
android:valueTo="@dimen/m3_extended_fab_disabled_elevation"
104104
android:valueType="floatType"/>
105105
</set>
106106
</item>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
<dimen name="m3_extended_fab_start_padding">16dp</dimen>
5858
<dimen name="m3_extended_fab_top_padding">8dp</dimen>
5959
<dimen name="m3_extended_fab_min_height">56dp</dimen>
60+
<dimen name="m3_extended_fab_disabled_elevation">0dp</dimen>
61+
<dimen name="m3_extended_fab_disabled_translation_z">0dp</dimen>
62+
<!-- This will make default/pressed/focused elevation remain at level 3. -->
63+
<dimen name="m3_extended_fab_translation_z_base">0dp</dimen>
64+
<dimen name="m3_extended_fab_translation_z_focused">0dp</dimen>
65+
<dimen name="m3_extended_fab_translation_z_pressed">0dp</dimen>
66+
<!-- This will make hovered elevation +2dp (level 3 -> level 4). -->
67+
<dimen name="m3_extended_fab_translation_z_hovered">2dp</dimen>
6068

6169
<dimen name="m3_small_fab_size">40dp</dimen>
6270
<dimen name="m3_small_fab_max_image_size">24dp</dimen>

0 commit comments

Comments
 (0)