commit d93942341f6c01bed6fce158e5f2e71c85e42c18
author Gabriel Peal <gpeal@users.noreply.github.com> Sun Dec 27 14:49:45 2020 -0800
committer GitHub <noreply@github.com> Sun Dec 27 14:49:45 2020 -0800
tree 93507faecf2f9a63a9836ff4e99a6cc312e7ffeb
parent 5038e4a7ea4e46d150b15e34bbf02675005188ed

Resume animations if the drawable gets reset (#1712)

lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 18ff5c8..01757a5 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -566,8 +566,7 @@
       return;
     } else if (!isNewComposition) {
       // The current drawable isn't lottieDrawable but the drawable already has the right composition.
-      setImageDrawable(null);
-      setImageDrawable(lottieDrawable);
+      setLottieDrawable();
     }
 
     // This is needed to makes sure that the animation is properly played/paused for the current visibility state.
@@ -958,8 +957,7 @@
   public void setScale(float scale) {
     lottieDrawable.setScale(scale);
     if (getDrawable() == lottieDrawable) {
-      setImageDrawable(null);
-      setImageDrawable(lottieDrawable);
+      setLottieDrawable();
     }
   }
 
@@ -1162,6 +1160,18 @@
     lottieOnCompositionLoadedListeners.clear();
   }
 
+  private void setLottieDrawable() {
+    boolean wasAnimating = isAnimating();
+    // Set the drawable to null first because the underlying LottieDrawable's intrinsic bounds can change
+    // if the composition changes.
+    setImageDrawable(null);
+    setImageDrawable(lottieDrawable);
+    if (wasAnimating) {
+      // This is necessary because lottieDrawable will get unscheduled and canceled when the drawable is set to null.
+      lottieDrawable.resumeAnimation();
+    }
+  }
+
   private static class SavedState extends BaseSavedState {
     String animationName;
     int animationResId;