commit f39fa3761212600b0b0ef8be0bde3c364e3e18d6
author Alan Viverette <alanv@google.com> Fri Jun 13 21:07:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 12 21:07:47 2014 +0000
tree 86b61e0c42a01baf683ffe385d54f77a84e9da37
parent 3fe7830f20d29ade3fec2d1ddb34d5a1caf393f5
parent 97fb0aa5090858705b66bfc4c05e7530c5d3d6b1

Merge "Only start AnimationDrawable on visibility change when animating"

graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
index a5a074c..e1dec9d 100644
--- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
@@ -537,4 +537,3 @@
         }
     }
 }
-

graphics/java/android/graphics/drawable/AnimationDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java
index 16548d0..1ee0224 100644
--- a/graphics/java/android/graphics/drawable/AnimationDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java
@@ -91,10 +91,10 @@
 
     @Override
     public boolean setVisible(boolean visible, boolean restart) {
-        boolean changed = super.setVisible(visible, restart);
+        final boolean changed = super.setVisible(visible, restart);
         if (visible) {
             if (changed || restart) {
-                setFrame(0, true, restart || mCurFrame >= 0);
+                setFrame(0, true, mAnimating);
             }
         } else {
             unscheduleSelf(this);