DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge \"Fix FAB StateListAnimator durations\" into nyc-support-24.1-dev

Browse Source 
am: 2165322f4c

Change-Id: I5d719438dcd74d0ba5f73c8ad294e42816e86f9a

GitOrigin-RevId=15b0019d3d6cbd513e0666bfdac4b2f11189af67

PiperOrigin-RevId: 140563976
This commit is contained in:
Chris Banes 2016-11-30 05:02:46 +00:00 committed by Travis Collins
parent 2a042b75a7
commit ec84012fa4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
View File

@ -86,7 +86,7 @@ class FloatingActionButtonLollipop extends FloatingActionButtonIcs {
// Animate elevation and translationZ to our values when pressed
AnimatorSet set = new AnimatorSet();
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation));
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0));
set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
.setDuration(PRESSED_ANIM_DURATION));
set.setInterpolator(ANIM_INTERPOLATOR);
@ -94,7 +94,7 @@ class FloatingActionButtonLollipop extends FloatingActionButtonIcs {
// Same deal for when we're focused
set = new AnimatorSet();
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation));
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0));
set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
.setDuration(PRESSED_ANIM_DURATION));
set.setInterpolator(ANIM_INTERPOLATOR);
@ -102,7 +102,7 @@ class FloatingActionButtonLollipop extends FloatingActionButtonIcs {
// Animate translationZ to 0 if not pressed
set = new AnimatorSet();
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation));
set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0));
Animator anim = ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f);
anim.setDuration(PRESSED_ANIM_DURATION);
anim.setStartDelay(PRESSED_ANIM_DELAY);
@ -112,8 +112,8 @@ class FloatingActionButtonLollipop extends FloatingActionButtonIcs {
// Animate everything to 0 when disabled
set = new AnimatorSet();
set.play(ObjectAnimator.ofFloat(mView, "elevation", 0f));
set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f));
set.play(ObjectAnimator.ofFloat(mView, "elevation", 0f).setDuration(0));
set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f).setDuration(0));
set.setInterpolator(ANIM_INTERPOLATOR);
stateListAnimator.addState(EMPTY_STATE_SET, set);