Merge "Add animations along a Path." (34d8519d) · Commits · e / os / android_frameworks_base

api/current.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -2537,22 +2537,36 @@ package android.animation {
		method public static android.animation.ObjectAnimator ofArgb(java.lang.Object, java.lang.String, int...);
		method public static android.animation.ObjectAnimator ofArgb(T, android.util.Property<T, java.lang.Integer>, int...);
		method public static android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, float...);
		method public static android.animation.ObjectAnimator ofFloat(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofFloat(T, android.util.Property<T, java.lang.Float>, float...);
		method public static android.animation.ObjectAnimator ofFloat(T, android.util.Property<T, java.lang.Float>, android.util.Property<T, java.lang.Float>, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, int...);
		method public static android.animation.ObjectAnimator ofInt(java.lang.Object, java.lang.String, java.lang.String, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofInt(T, android.util.Property<T, java.lang.Integer>, int...);
		method public static android.animation.ObjectAnimator ofInt(T, android.util.Property<T, java.lang.Integer>, android.util.Property<T, java.lang.Integer>, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, float[][]);
		method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofMultiFloat(java.lang.Object, java.lang.String, android.animation.TypeConverter<T, float[]>, android.animation.TypeEvaluator<T>, T...);
		method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, int[][]);
		method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofMultiInt(java.lang.Object, java.lang.String, android.animation.TypeConverter<T, int[]>, android.animation.TypeEvaluator<T>, T...);
		method public static android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeEvaluator, java.lang.Object...);
		method public static android.animation.ObjectAnimator ofObject(java.lang.Object, java.lang.String, android.animation.TypeConverter<android.graphics.PointF, ?>, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, V>, android.animation.TypeEvaluator<V>, V...);
		method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, P>, android.animation.TypeConverter<V, P>, android.animation.TypeEvaluator<V>, V...);
		method public static android.animation.ObjectAnimator ofObject(T, android.util.Property<T, V>, android.animation.TypeConverter<android.graphics.PointF, V>, android.graphics.Path);
		method public static android.animation.ObjectAnimator ofPropertyValuesHolder(java.lang.Object, android.animation.PropertyValuesHolder...);
		method public void setAutoCancel(boolean);
		method public void setProperty(android.util.Property);
		method public void setPropertyName(java.lang.String);
		}

		public class PointFEvaluator implements android.animation.TypeEvaluator {
		ctor public PointFEvaluator();
		ctor public PointFEvaluator(android.graphics.PointF);
		method public android.graphics.PointF evaluate(float, android.graphics.PointF, android.graphics.PointF);
		}

		public class PropertyValuesHolder implements java.lang.Cloneable {
		method public android.animation.PropertyValuesHolder clone();
		method public java.lang.String getPropertyName();
		@@ -2563,14 +2577,18 @@ package android.animation {
		method public static android.animation.PropertyValuesHolder ofKeyframe(java.lang.String, android.animation.Keyframe...);
		method public static android.animation.PropertyValuesHolder ofKeyframe(android.util.Property, android.animation.Keyframe...);
		method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, float[][]);
		method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.graphics.Path);
		method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.animation.TypeConverter<V, float[]>, android.animation.TypeEvaluator<V>, V...);
		method public static android.animation.PropertyValuesHolder ofMultiFloat(java.lang.String, android.animation.TypeConverter<T, float[]>, android.animation.TypeEvaluator<T>, android.animation.Keyframe...);
		method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, int[][]);
		method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.graphics.Path);
		method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.animation.TypeConverter<V, int[]>, android.animation.TypeEvaluator<V>, V...);
		method public static android.animation.PropertyValuesHolder ofMultiInt(java.lang.String, android.animation.TypeConverter<T, int[]>, android.animation.TypeEvaluator<T>, android.animation.Keyframe...);
		method public static android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeEvaluator, java.lang.Object...);
		method public static android.animation.PropertyValuesHolder ofObject(java.lang.String, android.animation.TypeConverter<android.graphics.PointF, ?>, android.graphics.Path);
		method public static android.animation.PropertyValuesHolder ofObject(android.util.Property, android.animation.TypeEvaluator<V>, V...);
		method public static android.animation.PropertyValuesHolder ofObject(android.util.Property<?, V>, android.animation.TypeConverter<T, V>, android.animation.TypeEvaluator<T>, T...);
		method public static android.animation.PropertyValuesHolder ofObject(android.util.Property<?, V>, android.animation.TypeConverter<android.graphics.PointF, V>, android.graphics.Path);
		method public void setConverter(android.animation.TypeConverter);
		method public void setEvaluator(android.animation.TypeEvaluator);
		method public void setFloatValues(float...);

core/java/android/animation/ObjectAnimator.java

+178 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.animation;

		import android.graphics.Path;
		import android.graphics.PointF;
		import android.util.Log;
		import android.util.Property;

		@@ -209,6 +211,31 @@ public final class ObjectAnimator extends ValueAnimator {
		return anim;
		}

		/**
		* Constructs and returns an ObjectAnimator that animates coordinates along a <code>Path</code>
		* using two properties. A <code>Path</code></> animation moves in two dimensions, animating
		* coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are integers that are set to separate properties designated by
		* <code>xPropertyName</code> and <code>yPropertyName</code>.
		*
		* @param target The object whose properties are to be animated. This object should
		* have public methods on it called <code>setNameX()</code> and
		* <code>setNameY</code>, where <code>nameX</code> and <code>nameY</code>
		* are the value of <code>xPropertyName</code> and <code>yPropertyName</code>
		* parameters, respectively.
		* @param xPropertyName The name of the property for the x coordinate being animated.
		* @param yPropertyName The name of the property for the y coordinate being animated.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static ObjectAnimator ofInt(Object target, String xPropertyName, String yPropertyName,
		Path path) {
		Keyframe[][] keyframes = PropertyValuesHolder.createKeyframes(path, true);
		PropertyValuesHolder x = PropertyValuesHolder.ofKeyframe(xPropertyName, keyframes[0]);
		PropertyValuesHolder y = PropertyValuesHolder.ofKeyframe(yPropertyName, keyframes[1]);
		return ofPropertyValuesHolder(target, x, y);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates between int values. A single
		* value implies that that value is the one being animated to. Two values imply starting
		@@ -227,6 +254,27 @@ public final class ObjectAnimator extends ValueAnimator {
		return anim;
		}

		/**
		* Constructs and returns an ObjectAnimator that animates coordinates along a <code>Path</code>
		* using two properties. A <code>Path</code></> animation moves in two dimensions, animating
		* coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are integers that are set to separate properties, <code>xProperty</code> and
		* <code>yProperty</code>.
		*
		* @param target The object whose properties are to be animated.
		* @param xProperty The property for the x coordinate being animated.
		* @param yProperty The property for the y coordinate being animated.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static <T> ObjectAnimator ofInt(T target, Property<T, Integer> xProperty,
		Property<T, Integer> yProperty, Path path) {
		Keyframe[][] keyframes = PropertyValuesHolder.createKeyframes(path, true);
		PropertyValuesHolder x = PropertyValuesHolder.ofKeyframe(xProperty, keyframes[0]);
		PropertyValuesHolder y = PropertyValuesHolder.ofKeyframe(yProperty, keyframes[1]);
		return ofPropertyValuesHolder(target, x, y);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates over int values for a multiple
		* parameters setter. Only public methods that take only int parameters are supported.
		@@ -248,6 +296,26 @@ public final class ObjectAnimator extends ValueAnimator {
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates the target using a multi-int setter
		* along the given <code>Path</code>. A <code>Path</code></> animation moves in two dimensions,
		* animating coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are integer x and y coordinates used in the first and second parameter of the
		* setter, respectively.
		*
		* @param target The object whose property is to be animated. This object may
		* have a public method on it called <code>setName()</code>, where <code>name</code> is
		* the value of the <code>propertyName</code> parameter. <code>propertyName</code> may also
		* be the case-sensitive complete name of the public setter method.
		* @param propertyName The name of the property being animated or the name of the setter method.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static ObjectAnimator ofMultiInt(Object target, String propertyName, Path path) {
		PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiInt(propertyName, path);
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates over values for a multiple int
		* parameters setter. Only public methods that take only int parameters are supported.
		@@ -258,7 +326,7 @@ public final class ObjectAnimator extends ValueAnimator {
		* @param target The object whose property is to be animated. This object may
		* have a public method on it called <code>setName()</code>, where <code>name</code> is
		* the value of the <code>propertyName</code> parameter. <code>propertyName</code> may also
		* be the complete name of the public method.
		* be the case-sensitive complete name of the public setter method.
		* @param propertyName The name of the property being animated or the name of the setter method.
		* @param converter Converts T objects into int parameters for the multi-value setter.
		* @param evaluator A TypeEvaluator that will be called on each animation frame to
		@@ -333,6 +401,31 @@ public final class ObjectAnimator extends ValueAnimator {
		return anim;
		}

		/**
		* Constructs and returns an ObjectAnimator that animates coordinates along a <code>Path</code>
		* using two properties. A <code>Path</code></> animation moves in two dimensions, animating
		* coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are floats that are set to separate properties designated by
		* <code>xPropertyName</code> and <code>yPropertyName</code>.
		*
		* @param target The object whose properties are to be animated. This object should
		* have public methods on it called <code>setNameX()</code> and
		* <code>setNameY</code>, where <code>nameX</code> and <code>nameY</code>
		* are the value of the <code>xPropertyName</code> and <code>yPropertyName</code>
		* parameters, respectively.
		* @param xPropertyName The name of the property for the x coordinate being animated.
		* @param yPropertyName The name of the property for the y coordinate being animated.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static ObjectAnimator ofFloat(Object target, String xPropertyName, String yPropertyName,
		Path path) {
		Keyframe[][] keyframes = PropertyValuesHolder.createKeyframes(path, false);
		PropertyValuesHolder x = PropertyValuesHolder.ofKeyframe(xPropertyName, keyframes[0]);
		PropertyValuesHolder y = PropertyValuesHolder.ofKeyframe(yPropertyName, keyframes[1]);
		return ofPropertyValuesHolder(target, x, y);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates between float values. A single
		* value implies that that value is the one being animated to. Two values imply starting
		@@ -352,6 +445,24 @@ public final class ObjectAnimator extends ValueAnimator {
		return anim;
		}

		/**
		* Constructs and returns an ObjectAnimator that animates coordinates along a <code>Path</code>
		* using two properties. A <code>Path</code></> animation moves in two dimensions, animating
		* coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are floats that are set to separate properties, <code>xProperty</code> and
		* <code>yProperty</code>.
		*
		* @param target The object whose properties are to be animated.
		* @param xProperty The property for the x coordinate being animated.
		* @param yProperty The property for the y coordinate being animated.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static <T> ObjectAnimator ofFloat(T target, Property<T, Float> xProperty,
		Property<T, Float> yProperty, Path path) {
		return ofFloat(target, xProperty.getName(), yProperty.getName(), path);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates over float values for a multiple
		* parameters setter. Only public methods that take only float parameters are supported.
		@@ -363,7 +474,7 @@ public final class ObjectAnimator extends ValueAnimator {
		* @param target The object whose property is to be animated. This object may
		* have a public method on it called <code>setName()</code>, where <code>name</code> is
		* the value of the <code>propertyName</code> parameter. <code>propertyName</code> may also
		* be the complete name of the public method.
		* be the case-sensitive complete name of the public setter method.
		* @param propertyName The name of the property being animated or the name of the setter method.
		* @param values A set of values that the animation will animate between over time.
		* @return An ObjectAnimator object that is set up to animate between the given values.
		@@ -374,6 +485,26 @@ public final class ObjectAnimator extends ValueAnimator {
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates the target using a multi-float setter
		* along the given <code>Path</code>. A <code>Path</code></> animation moves in two dimensions,
		* animating coordinates <code>(x, y)</code> together to follow the line. In this variation, the
		* coordinates are float x and y coordinates used in the first and second parameter of the
		* setter, respectively.
		*
		* @param target The object whose property is to be animated. This object may
		* have a public method on it called <code>setName()</code>, where <code>name</code> is
		* the value of the <code>propertyName</code> parameter. <code>propertyName</code> may also
		* be the case-sensitive complete name of the public setter method.
		* @param propertyName The name of the property being animated or the name of the setter method.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static ObjectAnimator ofMultiFloat(Object target, String propertyName, Path path) {
		PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiFloat(propertyName, path);
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates over values for a multiple float
		* parameters setter. Only public methods that take only float parameters are supported.
		@@ -425,6 +556,30 @@ public final class ObjectAnimator extends ValueAnimator {
		return anim;
		}

		/**
		* Constructs and returns an ObjectAnimator that animates a property along a <code>Path</code>.
		* A <code>Path</code></> animation moves in two dimensions, animating coordinates
		* <code>(x, y)</code> together to follow the line. This variant animates the coordinates
		* in a <code>PointF</code> to follow the <code>Path</code>. If the <code>Property</code>
		* associated with <code>propertyName</code> uses a type other than <code>PointF</code>,
		* <code>converter</code> can be used to change from <code>PointF</code> to the type
		* associated with the <code>Property</code>.
		*
		* @param target The object whose property is to be animated. This object should
		* have a public method on it called <code>setName()</code>, where <code>name</code> is
		* the value of the <code>propertyName</code> parameter.
		* @param propertyName The name of the property being animated.
		* @param converter Converts a PointF to the type associated with the setter. May be
		* null if conversion is unnecessary.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static ObjectAnimator ofObject(Object target, String propertyName,
		TypeConverter<PointF, ?> converter, Path path) {
		PropertyValuesHolder pvh = PropertyValuesHolder.ofObject(propertyName, converter, path);
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates between Object values. A single
		* value implies that that value is the one being animated to. Two values imply starting
		@@ -474,6 +629,27 @@ public final class ObjectAnimator extends ValueAnimator {
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates a property along a <code>Path</code>.
		* A <code>Path</code></> animation moves in two dimensions, animating coordinates
		* <code>(x, y)</code> together to follow the line. This variant animates the coordinates
		* in a <code>PointF</code> to follow the <code>Path</code>. If <code>property</code>
		* uses a type other than <code>PointF</code>, <code>converter</code> can be used to change
		* from <code>PointF</code> to the type associated with the <code>Property</code>.
		*
		* @param target The object whose property is to be animated.
		* @param property The property being animated. Should not be null.
		* @param converter Converts a PointF to the type associated with the setter. May be
		* null if conversion is unnecessary.
		* @param path The <code>Path</code> to animate values along.
		* @return An ObjectAnimator object that is set up to animate along <code>path</code>.
		*/
		public static <T, V> ObjectAnimator ofObject(T target, Property<T, V> property,
		TypeConverter<PointF, V> converter, Path path) {
		PropertyValuesHolder pvh = PropertyValuesHolder.ofObject(property, converter, path);
		return ofPropertyValuesHolder(target, pvh);
		}

		/**
		* Constructs and returns an ObjectAnimator that animates between the sets of values specified
		* in <code>PropertyValueHolder</code> objects. This variant should be used when animating

core/java/android/animation/PointFEvaluator.java

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.animation;

		import android.graphics.PointF;

		/**
		* This evaluator can be used to perform type interpolation between <code>PointF</code> values.
		*/
		public class PointFEvaluator implements TypeEvaluator<PointF> {

		/**
		* When null, a new PointF is returned on every evaluate call. When non-null,
		* mPoint will be modified and returned on every evaluate.
		*/
		private PointF mPoint;

		/**
		* Construct a PointFEvaluator that returns a new PointF on every evaluate call.
		* To avoid creating an object for each evaluate call,
		* {@link PointFEvaluator#PointFEvaluator(android.graphics.PointF)} should be used
		* whenever possible.
		*/
		public PointFEvaluator() {
		}

		/**
		* Constructs a PointFEvaluator that modifies and returns <code>reuse</code>
		* in {@link #evaluate(float, android.graphics.PointF, android.graphics.PointF)} calls.
		* The value returned from
		* {@link #evaluate(float, android.graphics.PointF, android.graphics.PointF)} should
		* not be cached because it will change over time as the object is reused on each
		* call.
		*
		* @param reuse A PointF to be modified and returned by evaluate.
		*/
		public PointFEvaluator(PointF reuse) {
		mPoint = reuse;
		}

		/**
		* This function returns the result of linearly interpolating the start and
		* end PointF values, with <code>fraction</code> representing the proportion
		* between the start and end values. The calculation is a simple parametric
		* calculation on each of the separate components in the PointF objects
		* (x, y).
		*
		* <p>If {@link #PointFEvaluator(android.graphics.PointF)} was used to construct
		* this PointFEvaluator, the object returned will be the <code>reuse</code>
		* passed into the constructor.</p>
		*
		* @param fraction The fraction from the starting to the ending values
		* @param startValue The start PointF
		* @param endValue The end PointF
		* @return A linear interpolation between the start and end values, given the
		* <code>fraction</code> parameter.
		*/
		@Override
		public PointF evaluate(float fraction, PointF startValue, PointF endValue) {
		float x = startValue.x + (fraction * (endValue.x - startValue.x));
		float y = startValue.y + (fraction * (endValue.y - startValue.y));

		if (mPoint != null) {
		mPoint.set(x, y);
		return mPoint;
		} else {
		return new PointF(x, y);
		}
		}
		}

core/java/android/animation/PropertyValuesHolder.java

+197 −5

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android/graphics/Path.cpp

+194 −1

File changed.

Preview size limit exceeded, changes collapsed.