commit 67a57dc8cb582d1dc66a2a87fbe51b48ab87168d
author Justin Klaassen <justinklaassen@google.com> Fri Jul 22 18:34:24 2016 -0700
committer Justin Klaassen <justinklaassen@google.com> Fri Jul 22 18:38:11 2016 -0700
tree c4bd59d27bb5c2e3216abb73e6fab4689768e7f3
parent 855ee5558c62bcd282d091a8771bdd2558765f44

Fix NPE in FAB StateListAnimator

- Added workaround for a bug in ValueAnimator that results in a NPE when
  a start delay is set and the anim is later cancelled by the
  StateListAnimator.
- Properly added animators to AnimatorSet using AnimatorSet#Builder.

Bug: 30190459
Change-Id: I51e1c3c3dfcecb5c89c315191a5f054f49f94669

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 6cf7948..d5fe912 100644
--- a/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
+++ b/design/lollipop/android/support/design/widget/FloatingActionButtonLollipop.java
@@ -86,34 +86,37 @@
 
         // Animate elevation and translationZ to our values when pressed
         AnimatorSet set = new AnimatorSet();
-        set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0));
-        set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
-                .setDuration(PRESSED_ANIM_DURATION));
+        set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0))
+                .with(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
+                        .setDuration(PRESSED_ANIM_DURATION));
         set.setInterpolator(ANIM_INTERPOLATOR);
         stateListAnimator.addState(PRESSED_ENABLED_STATE_SET, set);
 
         // Same deal for when we're focused
         set = new AnimatorSet();
-        set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0));
-        set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
-                .setDuration(PRESSED_ANIM_DURATION));
+        set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0))
+                .with(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, pressedTranslationZ)
+                        .setDuration(PRESSED_ANIM_DURATION));
         set.setInterpolator(ANIM_INTERPOLATOR);
         stateListAnimator.addState(FOCUSED_ENABLED_STATE_SET, set);
 
         // Animate translationZ to 0 if not pressed
         set = new AnimatorSet();
-        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);
-        set.play(anim);
+        // Use an AnimatorSet to set a start delay since there is a bug with ValueAnimator that
+        // prevents it from being cancelled properly when used with a StateListAnimator.
+        AnimatorSet anim = new AnimatorSet();
+        anim.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f)
+                        .setDuration(PRESSED_ANIM_DURATION))
+                .after(PRESSED_ANIM_DURATION);
+        set.play(ObjectAnimator.ofFloat(mView, "elevation", elevation).setDuration(0))
+                .with(anim);
         set.setInterpolator(ANIM_INTERPOLATOR);
         stateListAnimator.addState(ENABLED_STATE_SET, set);
 
         // Animate everything to 0 when disabled
         set = new AnimatorSet();
-        set.play(ObjectAnimator.ofFloat(mView, "elevation", 0f).setDuration(0));
-        set.play(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f).setDuration(0));
+        set.play(ObjectAnimator.ofFloat(mView, "elevation", 0f).setDuration(0))
+                .with(ObjectAnimator.ofFloat(mView, View.TRANSLATION_Z, 0f).setDuration(0));
         set.setInterpolator(ANIM_INTERPOLATOR);
         stateListAnimator.addState(EMPTY_STATE_SET, set);