Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df2491a4 authored Jan 31, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Jan 31, 2018

Merge "Make AnimatedImageDrawable.start reset"

parents 7db9d221 1996dbb1

graphics/java/android/graphics/drawable/AnimatedImageDrawable.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -319,7 +319,8 @@ public class AnimatedImageDrawable extends Drawable implements Animatable2 {
	/**		/**
	* Start the animation.		* Start the animation.
	*		*
	* <p>Does nothing if the animation is already running.		* <p>Does nothing if the animation is already running. If the animation is stopped,
			* this will reset it.</p>
	*		*
	* <p>If the animation starts, this will call		* <p>If the animation starts, this will call
	* {@link Animatable2.AnimationCallback#onAnimationStart}.</p>		* {@link Animatable2.AnimationCallback#onAnimationStart}.</p>

libs/hwui/hwui/AnimatedImageDrawable.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,9 @@ bool AnimatedImageDrawable::start() {
	return false;		return false;
	}		}

			// This will trigger a reset.
			mFinished = true;

	mRunning = true;		mRunning = true;
	return true;		return true;
	}		}