Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65734b2f authored Dec 09, 2016 by Doris Liu Committed by Android (Google) Code Review Dec 09, 2016

Merge "Add API info about Keyframe and PropertyValuesHolder" into nyc-mr2-dev

parents 8aa678b5 21b93c1f

core/java/android/animation/ObjectAnimator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,8 +38,8 @@ import java.lang.ref.WeakReference;
		*
		* {@sample development/samples/ApiDemos/res/anim/object_animator.xml ObjectAnimatorResources}
		*
		* <p>When using resource files, it is possible to use {@link PropertyValuesHolder} and
		* {@link Keyframe} to create more complex animations. Using PropertyValuesHolders
		* <p>Starting from API 23, it is possible to use {@link PropertyValuesHolder} and
		* {@link Keyframe} in resource files to create more complex animations. Using PropertyValuesHolders
		* allows animators to animate several properties in parallel, as shown in this sample:</p>
		*
		* {@sample development/samples/ApiDemos/res/anim/object_animator_pvh.xml

core/java/android/animation/ValueAnimator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ import java.util.HashMap;
		*
		* {@sample development/samples/ApiDemos/res/anim/animator.xml ValueAnimatorResources}
		*
		* <p>It is also possible to use a combination of {@link PropertyValuesHolder} and
		* {@link Keyframe} resource tags to create a multi-step animation.
		* <p>Starting from API 23, it is also possible to use a combination of {@link PropertyValuesHolder}
		* and {@link Keyframe} resource tags to create a multi-step animation.
		* Note that you can specify explicit fractional values (from 0 to 1) for
		* each keyframe to determine when, in the overall duration, the animation should arrive at that
		* value. Alternatively, you can leave the fractions off and the keyframes will be equally