Merge "Make the TimeAnimator class public." (f492b43f) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -2349,6 +2349,15 @@ package android.animation {
		method public void setPropertyName(java.lang.String);
		}

		public class TimeAnimator extends android.animation.ValueAnimator {
		ctor public TimeAnimator();
		method public void setTimeListener(android.animation.TimeAnimator.TimeListener);
		}

		public static abstract interface TimeAnimator.TimeListener {
		method public abstract void onTimeUpdate(android.animation.TimeAnimator, long, long);
		}

		public abstract interface TimeInterpolator {
		method public abstract float getInterpolation(float);
		}

core/java/android/animation/TimeAnimator.java

+11 −12

Original line number	Diff line number	Diff line
		package android.animation;

		/**
		* This class provides a simple callback mechanism to listeners that is synchronized with other
		* animators in the system. There is no duration, interpolation, or object value-setting
		* with this Animator. Instead, it is simply started and proceeds to send out events on every
		* animation frame to its TimeListener (if set), with information about this animator,
		* the total elapsed time, and the time since the last animation frame.
		*
		* @hide
		* This class provides a simple callback mechanism to listeners that is synchronized with all
		* other animators in the system. There is no duration, interpolation, or object value-setting
		* with this Animator. Instead, it is simply started, after which it proceeds to send out events
		* on every animation frame to its TimeListener (if set), with information about this animator,
		* the total elapsed time, and the elapsed time since the previous animation frame.
		*/
		public class TimeAnimator extends ValueAnimator {

		@@ -59,10 +57,10 @@ public class TimeAnimator extends ValueAnimator {
		* Implementors of this interface can set themselves as update listeners
		* to a <code>TimeAnimator</code> instance to receive callbacks on every animation
		* frame to receive the total time since the animator started and the delta time
		* since the last frame. The first time the listener is called, totalTime and
		* deltaTime should both be zero.
		*
		* @hide
		* since the last frame. The first time the listener is called,
		* deltaTime will be zero. The same is true for totalTime, unless the animator was
		* set to a specific {@link ValueAnimator#setCurrentPlayTime(long) currentPlayTime}
		* prior to starting.
		*/
		public static interface TimeListener {
		/**
		@@ -70,7 +68,8 @@ public class TimeAnimator extends ValueAnimator {
		* along with information about the elapsed time.</p>
		*
		* @param animation The animator sending out the notification.
		* @param totalTime The
		* @param totalTime The total time elapsed since the animator started, in milliseconds.
		* @param deltaTime The time elapsed since the previous frame, in milliseconds.
		*/
		void onTimeUpdate(TimeAnimator animation, long totalTime, long deltaTime);

core/java/android/view/View.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -2166,15 +2166,13 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
		float mScaleY = 1f;

		/**
		* The amount of scale in the x direction around the pivot point. A
		* value of 1 means no scaling is applied.
		* The x location of the point around which the view is rotated and scaled.
		*/
		@ViewDebug.ExportedProperty
		float mPivotX = 0f;

		/**
		* The amount of scale in the y direction around the pivot point. A
		* value of 1 means no scaling is applied.
		* The y location of the point around which the view is rotated and scaled.
		*/
		@ViewDebug.ExportedProperty
		float mPivotY = 0f;