Revert "Remove generics from Animator APIs"

This reverts commit 41f041d9986f8a5d45b6cb0b86e881c81a412168.

2 files changed, 46 insertions, 47 deletions

diff --git a/core/java/android/widget/AdapterViewAnimator.java b/core/java/android/widget/AdapterViewAnimator.java
index b5934b0..b7b1a23 100644
--- a/core/java/android/widget/AdapterViewAnimator.java
+++ b/core/java/android/widget/AdapterViewAnimator.java
@@ -138,8 +138,8 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
     /**
      * In and out animations.
      */
-    ObjectAnimator mInAnimation;
-    ObjectAnimator mOutAnimation;
+    ObjectAnimator<?> mInAnimation;
+    ObjectAnimator<?> mOutAnimation;
 
     private  ArrayList<View> mViewsToBringToFront;
 
@@ -246,16 +246,12 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
         }
     }
 
-    ObjectAnimator getDefaultInAnimation() {
-        ObjectAnimator anim = ObjectAnimator.ofFloat(null, "alpha", 0.0f, 1.0f);
-        anim.setDuration(DEFAULT_ANIMATION_DURATION);
-        return anim;
+    ObjectAnimator<?> getDefaultInAnimation() {
+        return new ObjectAnimator<Float>(DEFAULT_ANIMATION_DURATION, null, "alpha", 0.0f, 1.0f);
     }
 
-    ObjectAnimator getDefaultOutAnimation() {
-        ObjectAnimator anim = ObjectAnimator.ofFloat(null, "alpha", 1.0f, 0.0f);
-        anim.setDuration(DEFAULT_ANIMATION_DURATION);
-        return anim;
+    ObjectAnimator<?> getDefaultOutAnimation() {
+        return new ObjectAnimator<Float>(DEFAULT_ANIMATION_DURATION, null, "alpha", 1.0f, 0.0f);
     }
 
     /**
@@ -696,10 +692,10 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      *
      * @return An Animation or null if none is set.
      *
-     * @see #setInAnimation(android.animation.ObjectAnimator)
+     * @see #setInAnimation(android.view.animation.Animation)
      * @see #setInAnimation(android.content.Context, int)
      */
-    public ObjectAnimator getInAnimation() {
+    public ObjectAnimator<?> getInAnimation() {
         return mInAnimation;
     }
 
@@ -711,7 +707,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      * @see #getInAnimation()
      * @see #setInAnimation(android.content.Context, int)
      */
-    public void setInAnimation(ObjectAnimator inAnimation) {
+    public void setInAnimation(ObjectAnimator<?> inAnimation) {
         mInAnimation = inAnimation;
     }
 
@@ -720,10 +716,10 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      *
      * @return An Animation or null if none is set.
      *
-     * @see #setOutAnimation(android.animation.ObjectAnimator)
+     * @see #setOutAnimation(android.view.animation.Animation)
      * @see #setOutAnimation(android.content.Context, int)
      */
-    public ObjectAnimator getOutAnimation() {
+    public ObjectAnimator<?> getOutAnimation() {
         return mOutAnimation;
     }
 
@@ -735,7 +731,7 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      * @see #getOutAnimation()
      * @see #setOutAnimation(android.content.Context, int)
      */
-    public void setOutAnimation(ObjectAnimator outAnimation) {
+    public void setOutAnimation(ObjectAnimator<?> outAnimation) {
         mOutAnimation = outAnimation;
     }
 
@@ -746,10 +742,10 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      * @param resourceID The resource id of the animation.
      *
      * @see #getInAnimation()
-     * @see #setInAnimation(android.animation.ObjectAnimator)
+     * @see #setInAnimation(android.view.animation.Animation)
      */
     public void setInAnimation(Context context, int resourceID) {
-        setInAnimation((ObjectAnimator) AnimatorInflater.loadAnimator(context, resourceID));
+        setInAnimation((ObjectAnimator<?>) AnimatorInflater.loadAnimator(context, resourceID));
     }
 
     /**
@@ -759,10 +755,10 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
      * @param resourceID The resource id of the animation.
      *
      * @see #getOutAnimation()
-     * @see #setOutAnimation(android.animation.ObjectAnimator)
+     * @see #setOutAnimation(android.view.animation.Animation)
      */
     public void setOutAnimation(Context context, int resourceID) {
-        setOutAnimation((ObjectAnimator) AnimatorInflater.loadAnimator(context, resourceID));
+        setOutAnimation((ObjectAnimator<?>) AnimatorInflater.loadAnimator(context, resourceID));
     }
 
     /**
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 7e01506..f0954e2 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -175,8 +175,8 @@ public class StackView extends AdapterViewAnimator {
             }
             view.setVisibility(VISIBLE);
 
-            ObjectAnimator fadeIn = ObjectAnimator.ofFloat(view, "alpha", view.getAlpha(), 1.0f);
-            fadeIn.setDuration(DEFAULT_ANIMATION_DURATION);
+            ObjectAnimator<Float> fadeIn = new ObjectAnimator<Float>(DEFAULT_ANIMATION_DURATION,
+                    view, "alpha", view.getAlpha(), 1.0f);
             fadeIn.start();
         } else if (fromIndex == mNumActiveViews - 1 && toIndex == mNumActiveViews - 2) {
             // Slide item in
@@ -186,11 +186,12 @@ public class StackView extends AdapterViewAnimator {
             int duration = Math.round(mStackSlider.getDurationForNeutralPosition(mYVelocity));
 
             StackSlider animationSlider = new StackSlider(mStackSlider);
-            PropertyValuesHolder slideInY = PropertyValuesHolder.ofFloat("YProgress", 0.0f);
-            PropertyValuesHolder slideInX = PropertyValuesHolder.ofFloat("XProgress", 0.0f);
-            ObjectAnimator pa = ObjectAnimator.ofPropertyValuesHolder(animationSlider,
+            PropertyValuesHolder<Float> slideInY =
+                    new PropertyValuesHolder<Float>("YProgress", 0.0f);
+            PropertyValuesHolder<Float> slideInX =
+                    new PropertyValuesHolder<Float>("XProgress", 0.0f);
+            ObjectAnimator pa = new ObjectAnimator(duration, animationSlider,
                     slideInX, slideInY);
-            pa.setDuration(duration);
             pa.setInterpolator(new LinearInterpolator());
             pa.start();
         } else if (fromIndex == mNumActiveViews - 2 && toIndex == mNumActiveViews - 1) {
@@ -200,11 +201,12 @@ public class StackView extends AdapterViewAnimator {
             int duration = Math.round(mStackSlider.getDurationForOffscreenPosition(mYVelocity));
 
             StackSlider animationSlider = new StackSlider(mStackSlider);
-            PropertyValuesHolder slideOutY = PropertyValuesHolder.ofFloat("YProgress", 1.0f);
-            PropertyValuesHolder slideOutX = PropertyValuesHolder.ofFloat("XProgress", 0.0f);
-            ObjectAnimator pa = ObjectAnimator.ofPropertyValuesHolder(animationSlider,
-                    slideOutX, slideOutY);
-            pa.setDuration(duration);
+            PropertyValuesHolder<Float> slideOutY =
+                    new PropertyValuesHolder<Float>("YProgress", 1.0f);
+            PropertyValuesHolder<Float> slideOutX =
+                    new PropertyValuesHolder<Float>("XProgress", 0.0f);
+            ObjectAnimator pa = new ObjectAnimator(duration, animationSlider,
+                   slideOutX, slideOutY);
             pa.setInterpolator(new LinearInterpolator());
             pa.start();
         } else if (fromIndex == -1 && toIndex == mNumActiveViews - 1) {
@@ -215,8 +217,8 @@ public class StackView extends AdapterViewAnimator {
             lp.setVerticalOffset(-mSlideAmount);
         } else if (toIndex == -1) {
             // Fade item out
-            ObjectAnimator fadeOut = ObjectAnimator.ofFloat(view, "alpha", view.getAlpha(), 0.0f);
-            fadeOut.setDuration(DEFAULT_ANIMATION_DURATION);
+            ObjectAnimator<Float> fadeOut = new ObjectAnimator<Float>
+                    (DEFAULT_ANIMATION_DURATION, view, "alpha", view.getAlpha(), 0.0f);
             fadeOut.start();
         }
 
@@ -234,8 +236,8 @@ public class StackView extends AdapterViewAnimator {
         float r = (index * 1.0f) / (mNumActiveViews - 2);
 
         float scale = 1 - PERSPECTIVE_SCALE_FACTOR * (1 - r);
-        PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", scale);
-        PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", scale);
+        PropertyValuesHolder<Float> scaleX = new PropertyValuesHolder<Float>("scaleX", scale);
+        PropertyValuesHolder<Float> scaleY = new PropertyValuesHolder<Float>("scaleY", scale);
 
         r = (float) Math.pow(r, 2);
 
@@ -245,9 +247,9 @@ public class StackView extends AdapterViewAnimator {
                 (mMeasuredHeight * (1 - PERSPECTIVE_SHIFT_FACTOR) / 2.0f);
         float transY = perspectiveTranslation + scaleShiftCorrection;
 
-        PropertyValuesHolder translationY = PropertyValuesHolder.ofFloat("translationY", transY);
-        ObjectAnimator pa = ObjectAnimator.ofPropertyValuesHolder(view, scaleX, scaleY, translationY);
-        pa.setDuration(100);
+        PropertyValuesHolder<Float> translationY =
+                new PropertyValuesHolder<Float>("translationY", transY);
+        ObjectAnimator pa = new ObjectAnimator(100, view, scaleX, scaleY, translationY);
         pa.start();
     }
 
@@ -536,11 +538,12 @@ public class StackView extends AdapterViewAnimator {
             }
 
             StackSlider animationSlider = new StackSlider(mStackSlider);
-            PropertyValuesHolder snapBackY = PropertyValuesHolder.ofFloat("YProgress", finalYProgress);
-            PropertyValuesHolder snapBackX = PropertyValuesHolder.ofFloat("XProgress", 0.0f);
-            ObjectAnimator pa = ObjectAnimator.ofPropertyValuesHolder(animationSlider,
+            PropertyValuesHolder<Float> snapBackY =
+                    new PropertyValuesHolder<Float>("YProgress", finalYProgress);
+            PropertyValuesHolder<Float> snapBackX =
+                    new PropertyValuesHolder<Float>("XProgress", 0.0f);
+            ObjectAnimator pa = new ObjectAnimator(duration, animationSlider,
                     snapBackX, snapBackY);
-            pa.setDuration(duration);
             pa.setInterpolator(new LinearInterpolator());
             pa.start();
         } else if (mSwipeGestureType == GESTURE_SLIDE_DOWN) {
@@ -554,12 +557,12 @@ public class StackView extends AdapterViewAnimator {
             }
 
             StackSlider animationSlider = new StackSlider(mStackSlider);
-            PropertyValuesHolder snapBackY =
-                    PropertyValuesHolder.ofFloat("YProgress",finalYProgress);
-            PropertyValuesHolder snapBackX = PropertyValuesHolder.ofFloat("XProgress", 0.0f);
-            ObjectAnimator pa = ObjectAnimator.ofPropertyValuesHolder(animationSlider,
+            PropertyValuesHolder<Float> snapBackY =
+                    new PropertyValuesHolder<Float>("YProgress", finalYProgress);
+            PropertyValuesHolder<Float> snapBackX =
+                    new PropertyValuesHolder<Float>("XProgress", 0.0f);
+            ObjectAnimator pa = new ObjectAnimator(duration, animationSlider,
                     snapBackX, snapBackY);
-            pa.setDuration(duration);
             pa.start();
         }