Merge "Add more functionality to ViewPropertyAnimator." (dfe1645c) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -21861,6 +21861,9 @@ package android.view {
		public class ViewPropertyAnimator {
		method public android.view.ViewPropertyAnimator alpha(float);
		method public android.view.ViewPropertyAnimator alphaBy(float);
		method public void cancel();
		method public long getDuration();
		method public long getStartDelay();
		method public android.view.ViewPropertyAnimator rotation(float);
		method public android.view.ViewPropertyAnimator rotationBy(float);
		method public android.view.ViewPropertyAnimator rotationX(float);
		@@ -21874,6 +21877,8 @@ package android.view {
		method public android.view.ViewPropertyAnimator setDuration(long);
		method public android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator);
		method public android.view.ViewPropertyAnimator setListener(android.animation.Animator.AnimatorListener);
		method public android.view.ViewPropertyAnimator setStartDelay(long);
		method public void start();
		method public android.view.ViewPropertyAnimator translationX(float);
		method public android.view.ViewPropertyAnimator translationXBy(float);
		method public android.view.ViewPropertyAnimator translationY(float);

core/java/android/view/ViewPropertyAnimator.java

+95 −1

Original line number	Diff line number	Diff line
		@@ -66,6 +66,19 @@ public class ViewPropertyAnimator {
		*/
		private boolean mDurationSet = false;

		/**
		* The startDelay of the underlying Animator object. By default, we don't set the startDelay
		* on the Animator and just use its default startDelay. If the startDelay is ever set on this
		* Animator, then we use the startDelay that it was set to.
		*/
		private long mStartDelay = 0;

		/**
		* A flag indicating whether the startDelay has been set on this object. If not, we don't set
		* the startDelay on the underlying Animator, but instead just use its default startDelay.
		*/
		private boolean mStartDelaySet = false;

		/**
		* The interpolator of the underlying Animator object. By default, we don't set the interpolator
		* on the Animator and just use its default interpolator. If the interpolator is ever set on
		@@ -232,6 +245,60 @@ public class ViewPropertyAnimator {
		return this;
		}

		/**
		* Returns the current duration of property animations. If the duration was set on this
		* object, that value is returned. Otherwise, the default value of the underlying Animator
		* is returned.
		*
		* @see #setDuration(long)
		* @return The duration of animations, in milliseconds.
		*/
		public long getDuration() {
		if (mStartDelaySet) {
		return mStartDelay;
		} else {
		// Just return the default from ValueAnimator, since that's what we'd get if
		// the value has not been set otherwise
		return new ValueAnimator().getDuration();
		}
		}

		/**
		* Returns the current startDelay of property animations. If the startDelay was set on this
		* object, that value is returned. Otherwise, the default value of the underlying Animator
		* is returned.
		*
		* @see #setStartDelay(long)
		* @return The startDelay of animations, in milliseconds.
		*/
		public long getStartDelay() {
		if (mStartDelaySet) {
		return mStartDelay;
		} else {
		// Just return the default from ValueAnimator (0), since that's what we'd get if
		// the value has not been set otherwise
		return 0;
		}
		}

		/**
		* Sets the startDelay for the underlying animator that animates the requested properties.
		* By default, the animator uses the default value for ValueAnimator. Calling this method
		* will cause the declared value to be used instead.
		* @param startDelay The delay of ensuing property animations, in milliseconds. The value
		* cannot be negative.
		* @return This object, allowing calls to methods in this class to be chained.
		*/
		public ViewPropertyAnimator setStartDelay(long startDelay) {
		if (startDelay < 0) {
		throw new IllegalArgumentException("Animators cannot have negative duration: " +
		startDelay);
		}
		mStartDelaySet = true;
		mStartDelay = startDelay;
		return this;
		}

		/**
		* Sets the interpolator for the underlying animator that animates the requested properties.
		* By default, the animator uses the default interpolator for ValueAnimator. Calling this method
		@@ -258,6 +325,33 @@ public class ViewPropertyAnimator {
		return this;
		}

		/**
		* Starts the currently pending property animations immediately. Calling <code>start()</code>
		* is optional because all animations start automatically at the next opportunity. However,
		* if the animations are needed to start immediately and synchronously (not at the time when
		* the next event is processed by the hierarchy, which is when the animations would begin
		* otherwise), then this method can be used.
		*/
		public void start() {
		startAnimation();
		}

		/**
		* Cancels all property animations that are currently running or pending.
		*/
		public void cancel() {
		if (mAnimatorMap.size() > 0) {
		HashMap<Animator, PropertyBundle> mAnimatorMapCopy =
		(HashMap<Animator, PropertyBundle>)mAnimatorMap.clone();
		Set<Animator> animatorSet = mAnimatorMapCopy.keySet();
		for (Animator runningAnim : animatorSet) {
		runningAnim.cancel();
		}
		}
		mPendingAnimations.clear();
		mView.getHandler().removeCallbacks(mAnimationStarter);
		}

		/**
		* This method will cause the View's <code>x</code> property to be animated to the
		* specified value. Animations already running on the property will be canceled.
		@@ -598,7 +692,7 @@ public class ViewPropertyAnimator {
		// on a property will cancel a previous animation on that property, so
		// there can only ever be one such animation running.
		if (bundle.mPropertyMask == NONE) {
		// the animation is not longer changing anything - cancel it
		// the animation is no longer changing anything - cancel it
		animatorToCancel = runningAnim;
		break;
		}