Skip to content

Commit

Permalink
[M3][Button] Update elevation to match specs
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 411148215
  • Loading branch information
@paulfthomas
paulfthomas committed Nov 29, 2021
1 parent 89d80d0 commit db64adb
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 41 deletions.
40 changes: 2 additions & 38 deletions ...a/com/google/android/material/button/res/animator/m3_btn_elevated_btn_state_list_anim.xml
View file
Expand Up @@ -17,24 +17,6 @@
<set xmlns:android="http://schemas.android.com/apk/res/android">
<selector>

<!-- Pressed state -->
<item
android:state_enabled="true"
android:state_pressed="true">
<set>
<objectAnimator
android:duration="@integer/m3_btn_anim_duration_ms"
android:propertyName="translationZ"
android:valueTo="@dimen/m3_btn_translation_z_pressed"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
android:propertyName="elevation"
android:valueTo="@dimen/m3_btn_elevated_btn_elevation"
android:valueType="floatType"/>
</set>
</item>

<!-- Hover state. This is triggered via mouse. -->
<item
android:state_enabled="true"
Expand All @@ -43,25 +25,7 @@
<objectAnimator
android:duration="@integer/m3_btn_anim_duration_ms"
android:propertyName="translationZ"
android:valueTo="@dimen/m3_btn_translation_z_hovered_focused"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
android:propertyName="elevation"
android:valueTo="@dimen/m3_btn_elevated_btn_elevation"
android:valueType="floatType"/>
</set>
</item>

<!-- Focused state. This is triggered via keyboard. -->
<item
android:state_enabled="true"
android:state_focused="true">
<set>
<objectAnimator
android:duration="@integer/m3_btn_anim_duration_ms"
android:propertyName="translationZ"
android:valueTo="@dimen/m3_btn_translation_z_hovered_focused"
android:valueTo="@dimen/m3_btn_translation_z_hovered"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
Expand All @@ -71,7 +35,7 @@
</set>
</item>

<!-- Base state (enabled, not pressed) -->
<!-- Base state (enabled) -->
<item android:state_enabled="true">
<set>
<objectAnimator
Expand Down
72 changes: 72 additions & 0 deletions lib/java/com/google/android/material/button/res/animator/m3_btn_state_list_anim.xml
View file
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 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.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<selector>

<!-- Hover state. This is triggered via mouse. -->
<item
android:state_enabled="true"
android:state_hovered="true">
<set>
<objectAnimator
android:duration="@integer/m3_btn_anim_duration_ms"
android:propertyName="translationZ"
android:valueTo="@dimen/m3_btn_translation_z_hovered"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
android:propertyName="elevation"
android:valueTo="@dimen/m3_btn_elevation"
android:valueType="floatType"/>
</set>
</item>

<!-- Base state (enabled) -->
<item android:state_enabled="true">
<set>
<objectAnimator
android:duration="@integer/m3_btn_anim_duration_ms"
android:propertyName="translationZ"
android:startDelay="@integer/m3_btn_anim_delay_ms"
android:valueTo="@dimen/m3_btn_translation_z_base"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
android:propertyName="elevation"
android:valueTo="@dimen/m3_btn_elevation"
android:valueType="floatType"/>
</set>
</item>

<!-- Disabled state -->
<item>
<set>
<objectAnimator
android:duration="0"
android:propertyName="translationZ"
android:valueTo="@dimen/m3_btn_disabled_translation_z"
android:valueType="floatType"/>
<objectAnimator
android:duration="0"
android:propertyName="elevation"
android:valueTo="@dimen/m3_btn_disabled_elevation"
android:valueType="floatType"/>
</set>
</item>

</selector>
</set>
4 changes: 2 additions & 2 deletions lib/java/com/google/android/material/button/res/values/dimens.xml
View file
Expand Up @@ -59,6 +59,7 @@
<dimen name="m3_btn_padding_right">24dp</dimen>
<dimen name="m3_btn_padding_top">6dp</dimen>
<dimen name="m3_btn_padding_bottom">6dp</dimen>
<dimen name="m3_btn_elevation">0dp</dimen>
<dimen name="m3_btn_elevated_btn_elevation">1dp</dimen>
<dimen name="m3_btn_icon_btn_padding_left">16dp</dimen>
<dimen name="m3_btn_icon_btn_padding_right">24dp</dimen>
Expand All @@ -75,8 +76,7 @@
<dimen name="m3_btn_dialog_btn_spacing">8dp</dimen>

<dimen name="m3_btn_translation_z_base">0dp</dimen>
<dimen name="m3_btn_translation_z_pressed">3dp</dimen>
<dimen name="m3_btn_translation_z_hovered_focused">1dp</dimen>
<dimen name="m3_btn_translation_z_hovered">1dp</dimen>
<dimen name="m3_btn_disabled_translation_z">0dp</dimen>
<dimen name="m3_btn_disabled_elevation">0dp</dimen>

Expand Down
3 changes: 2 additions & 1 deletion lib/java/com/google/android/material/button/res/values/styles.xml
View file
Expand Up @@ -134,7 +134,8 @@
<item name="android:textAppearance">?attr/textAppearanceLabelLarge</item>
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.Button</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button</item>

<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/m3_btn_state_list_anim</item>
<item name="elevation">@dimen/m3_btn_elevation</item>
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
<item name="iconSize">18dp</item>
Expand Down

0 comments on commit db64adb

Please sign in to comment.