From ec84012fa4d86cde5ee22c4a6ad5dee6d92d06e1 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 05:02:46 +0000 Subject: [PATCH] Merge \"Fix FAB StateListAnimator durations\" into nyc-support-24.1-dev am: 2165322f4c Change-Id: I5d719438dcd74d0ba5f73c8ad294e42816e86f9a GitOrigin-RevId=15b0019d3d6cbd513e0666bfdac4b2f11189af67 PiperOrigin-RevId: 140563976 --- .../design/widget/FloatingActionButtonLollipop.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java b/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java index 85e10b6b3..6cf7948ab 100644 --- a/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java +++ b/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java @@ -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);