am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make... (08cec07f) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewPropertyAnimator.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -80,11 +80,17 @@ public class ViewPropertyAnimator {

		/**
		* 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 set to a
		* non-null value on this Animator, then we use the interpolator that it was set to.
		* on the Animator and just use its default interpolator. If the interpolator is ever set on
		* this Animator, then we use the interpolator that it was set to.
		*/
		private TimeInterpolator mInterpolator;

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

		/**
		* Listener for the lifecycle events of the underlying ValueAnimator object.
		*/
		@@ -332,6 +338,7 @@ public class ViewPropertyAnimator {
		* @return This object, allowing calls to methods in this class to be chained.
		*/
		public ViewPropertyAnimator setInterpolator(TimeInterpolator interpolator) {
		mInterpolatorSet = true;
		mInterpolator = interpolator;
		return this;
		}
		@@ -342,7 +349,7 @@ public class ViewPropertyAnimator {
		* @return The timing interpolator for this animation.
		*/
		public TimeInterpolator getInterpolator() {
		if (mInterpolator != null) {
		if (mInterpolatorSet) {
		return mInterpolator;
		} else {
		// Just return the default from ValueAnimator, since that's what we'd get if
		@@ -890,7 +897,7 @@ public class ViewPropertyAnimator {
		if (mDurationSet) {
		animator.setDuration(mDuration);
		}
		if (mInterpolator != null) {
		if (mInterpolatorSet) {
		animator.setInterpolator(mInterpolator);
		}
		animator.start();