Merge "Fix AnimationDrawable double-start bug" (f3bd2f7a) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ import android.util.AttributeSet;
		* <p>spin_animation.xml file in res/drawable/ folder:</p>
		* <pre><!-- Animation frames are wheel0.png -- wheel5.png files inside the
		* res/drawable/ folder -->
		* <animation-list android:id="selected" android:oneshot="false">
		* <animation-list android:id="@+id/selected" android:oneshot="false">
		* <item android:drawable="@drawable/wheel0" android:duration="50" />
		* <item android:drawable="@drawable/wheel1" android:duration="50" />
		* <item android:drawable="@drawable/wheel2" android:duration="50" />
		@@ -216,6 +216,8 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
		unscheduleSelf(this);
		}
		if (animate) {
		// Unscheduling may have clobbered this value; restore it to record that we're animating
		mCurFrame = frame;
		scheduleSelf(this, SystemClock.uptimeMillis() + mAnimationState.mDurations[frame]);
		}
		}