Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 (bb7f590a) · Commits · e / os / android_frameworks_base

core/java/android/animation/AnimatorSet.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,13 @@ import java.util.List;
		* result in none of the affected animations being played. Because of this (and because
		* circular dependencies do not make logical sense anyway), circular dependencies
		* should be avoided, and the dependency flow of animations should only be in one direction.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about animating with {@code AnimatorSet}, read the
		* <a href="{@docRoot}guide/topics/graphics/prop-animation.html#choreography">Property
		* Animation</a> developer guide.</p>
		* </div>
		*/
		public final class AnimatorSet extends Animator {

+7 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,13 @@ import java.util.ArrayList;
		* are then determined internally and the animation will call these functions as necessary to
		* animate the property.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about animating with {@code ObjectAnimator}, read the
		* <a href="{@docRoot}guide/topics/graphics/prop-animation.html#object-animator">Property
		* Animation</a> developer guide.</p>
		* </div>
		*
		* @see #setPropertyName(String)
		*
		*/

+7 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,13 @@ import java.util.HashMap;
		* {@link AccelerateDecelerateInterpolator} class, which accelerates into and decelerates
		* out of an animation. This behavior can be changed by calling
		* {@link ValueAnimator#setInterpolator(TimeInterpolator)}.</p>
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about animating with {@code ValueAnimator}, read the
		* <a href="{@docRoot}guide/topics/graphics/prop-animation.html#value-animator">Property
		* Animation</a> developer guide.</p>
		* </div>
		*/
		public class ValueAnimator extends Animator {

+5 −5

Original line number	Diff line number	Diff line
		@@ -7,15 +7,15 @@ color values are supported by default. You can animate any other type by telling
		to calculate the values for that given type with a custom {@link android.animation.TypeEvaluator}.
		</p>

		<p>For more information, see the
		<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide.</p>
		{@more}

		<p>
		You can set many different types of interpolators (contained in {@link android.view.animation}),
		specify {@link android.animation.Keyframe keyframes}, or group animations to play sequentially
		or simultaneously (with {@link android.animation.AnimatorSet}) to further control your animation
		behaviors.</p>

		<p>
		For a guide on how to use the property animation system, see the
		<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide.
		</p>
		</body>
		</html>
		No newline at end of file

+5 −4

Original line number	Diff line number	Diff line
		@@ -48,10 +48,11 @@ import java.util.List;
		* {@link android.content.Context#getSystemService
		* context.getSystemService(Context.SEARCH_SERVICE)}.
		*
		* <div class="special">
		* <p>For a guide to using the search dialog and adding search
		* suggestions in your application, see the Dev Guide topic about <strong><a
		* href="{@docRoot}guide/topics/search/index.html">Search</a></strong>.</p>
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using the search dialog and adding search
		* suggestions in your application, read the
		* <a href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p>
		* </div>
		*/
		public class SearchManager