am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator" (d766d71a) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewPropertyAnimator.java

+20 −2

Original line number	Diff line number	Diff line
		@@ -97,6 +97,12 @@ public class ViewPropertyAnimator {
		*/
		private Animator.AnimatorListener mListener = null;

		/**
		* A lazily-created ValueAnimator used in order to get some default animator properties
		* (duration, start delay, interpolator, etc.).
		*/
		private ValueAnimator mTempValueAnimator;

		/**
		* This listener is the mechanism by which the underlying Animator causes changes to the
		* properties currently being animated, as well as the cleanup after an animation is
		@@ -268,7 +274,10 @@ public class ViewPropertyAnimator {
		} 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();
		if (mTempValueAnimator == null) {
		mTempValueAnimator = new ValueAnimator();
		}
		return mTempValueAnimator.getDuration();
		}
		}

		@@ -328,7 +337,16 @@ public class ViewPropertyAnimator {
		* @return The timing interpolator for this animation.
		*/
		public TimeInterpolator getInterpolator() {
		return null;
		if (mInterpolatorSet) {
		return mInterpolator;
		} else {
		// Just return the default from ValueAnimator, since that's what we'd get if
		// the value has not been set otherwise
		if (mTempValueAnimator == null) {
		mTempValueAnimator = new ValueAnimator();
		}
		return mTempValueAnimator.getInterpolator();
		}
		}

		/**