commit 2165322f4ce079b6d1139e57ff483161df7ce40f
author Chris Banes <chrisbanes@google.com> Mon Jul 18 08:41:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 18 08:41:03 2016 +0000
tree 3b9f079ade8f55ee86ba510af456b2547d218683
parent e82a35aabd2b303083a1b55874987ecfb5a44a70
parent 7cda36a81d8c91cf30194066fb0d23bbf2afb71a

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

design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java

diff --git a/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java b/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
index 85e10b6..6cf7948 100644
--- a/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
+++ b/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
@@ -86,7 +86,7 @@
 
         // 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 @@
 
         // 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 @@
 
         // 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 @@
 
         // 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);