Merge "Make the new android.animation package public"

4 files changed, 13 insertions, 14 deletions

diff --git a/core/java/android/animation/Keyframe.java b/core/java/android/animation/Keyframe.java
index 0f39635..e2800b3 100644
--- a/core/java/android/animation/Keyframe.java
+++ b/core/java/android/animation/Keyframe.java
@@ -19,7 +19,7 @@ package android.animation;
 import android.view.animation.Interpolator;
 
 /**
- * This class represents timea time/value pair for an animation. The Keyframe class is used
+ * This class holds a time/value pair for an animation. The Keyframe class is used
  * by {@link Animator} to define the values that the animation target will have over the course
  * of the animation. As the time proceeds from one keyframe to the other, the value of the
  * target object will animate between the value at the previous keyframe and the value at the
@@ -144,7 +144,7 @@ public class Keyframe {
     /**
      * Sets the value for this Keyframe.
      *
-     * @param The value for this Keyframe.
+     * @param value value for this Keyframe.
      */
     public void setValue(Object value) {
         mValue = value;
@@ -163,7 +163,7 @@ public class Keyframe {
     /**
      * Sets the time for this keyframe, as a fraction of the overall animation duration.
      *
-     * @param The time associated with this keyframe, as a fraction of the overall animation
+     * @param fraction time associated with this keyframe, as a fraction of the overall animation
      * duration. This should be a value between 0 and 1.
      */
     public void setFraction(float fraction) {
@@ -192,9 +192,8 @@ public class Keyframe {
 
     /**
      * Gets the type of keyframe. This information is used by Animator to determine the type of
-     * {@linke TypeEvaluator} to use when calculating values between keyframes. The type is based
-     * on the type of Keyframe created. For example, {@link IntKeyframe} returns a value of
-     * <code>int.class</code>. This superclass returns a value of <code>Object.class</code>.
+     * {@link TypeEvaluator} to use when calculating values between keyframes. The type is based
+     * on the type of Keyframe created.
      *
      * @return The type of the value stored in the Keyframe.
      */
diff --git a/core/java/android/animation/Sequencer.java b/core/java/android/animation/Sequencer.java
index c283e0f..84dbcc1 100644
--- a/core/java/android/animation/Sequencer.java
+++ b/core/java/android/animation/Sequencer.java
@@ -29,10 +29,10 @@ import java.util.HashMap;
  * can be set up to play together, in sequence, or after a specified delay.
  *
  * <p>There are two different approaches to adding animations to a <code>Sequencer</code>:
- * either the {@link Sequencer#playTogether(Animatable...) playTogether()} or
- * {@link Sequencer#playSequentially(Animatable...) playSequentially()} methods can be called to add
+ * either the {@link Sequencer#playTogether(Animatable[]) playTogether()} or
+ * {@link Sequencer#playSequentially(Animatable[]) playSequentially()} methods can be called to add
  * a set of animations all at once, or the {@link Sequencer#play(Animatable)} can be
- * used in conjunction with methods in the {@link myandroid.animation.Sequencer.Builder Builder}
+ * used in conjunction with methods in the {@link android.animation.Sequencer.Builder Builder}
  * class to add animations
  * one by one.</p>
  *
@@ -46,7 +46,7 @@ import java.util.HashMap;
 public final class Sequencer extends Animatable {
 
     /**
-     * Tracks aniamtions currently being played, so that we know what to
+     * Tracks animations currently being played, so that we know what to
      * cancel or end when cancel() or end() is called on this Sequencer
      */
     private final ArrayList<Animatable> mPlayingSet = new ArrayList<Animatable>();
@@ -577,8 +577,8 @@ public final class Sequencer extends Animatable {
      * intention of the <code>Builder</code> methods, along with the {@link
      * Sequencer#play(Animatable) play()} method of <code>Sequencer</code> is to make it possible to
      * express the dependency relationships of animations in a natural way. Developers can also use
-     * the {@link Sequencer#playTogether(Animatable...) playTogether()} and {@link
-     * Sequencer#playSequentially(Animatable...) playSequentially()} methods if these suit the need,
+     * the {@link Sequencer#playTogether(Animatable[]) playTogether()} and {@link
+     * Sequencer#playSequentially(Animatable[]) playSequentially()} methods if these suit the need,
      * but it might be easier in some situations to express the sequence of animations in pairs.
      * <p/>
      * <p>The <code>Builder</code> object cannot be constructed directly, but is rather constructed
diff --git a/core/java/android/animation/package.html b/core/java/android/animation/package.html
index 1c9bf9d..b66669b 100644
--- a/core/java/android/animation/package.html
+++ b/core/java/android/animation/package.html
@@ -1,5 +1,6 @@
 <html>
 <body>
-    {@hide}
+Provides classes for animating values over time, and setting those values on target
+objects.
 </body>
 </html>
diff --git a/core/java/android/view/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java
index bfc30a5..8e4cf67 100644
--- a/core/java/android/view/animation/AnimationUtils.java
+++ b/core/java/android/view/animation/AnimationUtils.java
@@ -99,7 +99,6 @@ public class AnimationUtils {
      * @param id The resource id of the animation to load
      * @return The animation object reference by the specified id
      * @throws NotFoundException when the animation cannot be loaded
-     * @hide
      */
     public static Animatable loadAnimator(Context context, int id)
             throws NotFoundException {