commit 472b281d5cb4f5660df981a6c912266b9f5703fe
author Chet Haase <chet@google.com> Thu Oct 14 07:02:04 2010 -0700
committer Chet Haase <chet@google.com> Thu Oct 14 10:51:21 2010 -0700
tree ec2393d2d472bda0893e861e19722ab9f7cc3c27
parent 564976a46ef02d665aa0e455ad7867746a0b5325

Updating code to use new non-generified animator APIs

Change-Id: Ie1928a22f774b226d90fa0918f61dba35d183dd6

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index d7c2f5b..6fcf432 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -318,8 +318,9 @@
                     // animate the changing of the tab content by fading pages in and out
                     final int duration = 150;
                     final float alpha = mCustomizePagedView.getAlpha();
-                    ValueAnimator alphaAnim = new ObjectAnimator(duration, mCustomizePagedView,
+                    ValueAnimator alphaAnim = ObjectAnimator.ofFloat(mCustomizePagedView,
                             "alpha", alpha, 0.0f);
+                    alphaAnim.setDuration(duration);
                     alphaAnim.addListener(new AnimatorListenerAdapter() {
                         public void onAnimationEnd(Animator animation) {
                             String tag = mHomeCustomizationDrawer.getCurrentTabTag();
@@ -341,8 +342,9 @@
                             }
 
                             final float alpha = mCustomizePagedView.getAlpha();
-                            ValueAnimator alphaAnim = new ObjectAnimator(duration,
+                            ValueAnimator alphaAnim = ObjectAnimator.ofFloat(
                                     mCustomizePagedView, "alpha", alpha, 1.0f);
+                            alphaAnim.setDuration(duration);
                             alphaAnim.start();
                         }
                     });
@@ -2284,7 +2286,8 @@
                 getResources().getInteger(R.integer.config_toolbarButtonFadeOutTime);
 
         if (seq != null) {
-            Animator anim = new ObjectAnimator<Float>(duration, view, "alpha", show ? 1.0f : 0.0f);
+            Animator anim = ObjectAnimator.ofFloat(view, "alpha", show ? 1.0f : 0.0f);
+            anim.setDuration(duration);
             anim.addListener(new AnimatorListenerAdapter() {
                 public void onAnimationStart(Animator animation) {
                     if (showing) showToolbarButton(view);
@@ -2383,9 +2386,10 @@
         }
 
         if (animated) {
-            ValueAnimator scaleAnim = new ObjectAnimator(duration, toView,
-                    new PropertyValuesHolder<Float>("scaleX", scale, 1.0f),
-                    new PropertyValuesHolder<Float>("scaleY", scale, 1.0f));
+            ValueAnimator scaleAnim = ObjectAnimator.ofPropertyValuesHolder(toView,
+                    PropertyValuesHolder.ofFloat("scaleX", scale, 1.0f),
+                    PropertyValuesHolder.ofFloat("scaleY", scale, 1.0f));
+            scaleAnim.setDuration(duration);
             scaleAnim.setInterpolator(new DecelerateInterpolator());
             scaleAnim.addListener(new AnimatorListenerAdapter() {
                 public void onAnimationStart(Animator animation) {
@@ -2445,9 +2449,10 @@
         if (animated) {
             if (mStateAnimation != null) mStateAnimation.cancel();
             mStateAnimation = new AnimatorSet();
-            ValueAnimator scaleAnim = new ObjectAnimator(duration, fromView,
-                    new PropertyValuesHolder<Float>("scaleX", scaleFactor),
-                    new PropertyValuesHolder<Float>("scaleY", scaleFactor));
+            ValueAnimator scaleAnim = ObjectAnimator.ofPropertyValuesHolder(fromView,
+                    PropertyValuesHolder.ofFloat("scaleX", scaleFactor),
+                    PropertyValuesHolder.ofFloat("scaleY", scaleFactor));
+            scaleAnim.setDuration(duration);
             scaleAnim.setInterpolator(new AccelerateInterpolator());
             mStateAnimation.addListener(new AnimatorListenerAdapter() {
                 public void onAnimationEnd(Animator animation) {
@@ -2522,10 +2527,13 @@
             AnimatorSet toolbarShowAnim = new AnimatorSet();
             hideAndShowToolbarButtons(toState, toolbarShowAnim, toolbarHideAnim);
 
-            mStateAnimation.playTogether(
-                    toolbarHideAnim,
-                    new ObjectAnimator(duration, fromView, "y", fromViewStartY, fromViewEndY),
-                    new ObjectAnimator(duration, toView, "y", toViewStartY, toViewEndY));
+            ObjectAnimator fromAnim = ObjectAnimator.ofFloat(fromView, "y",
+                    fromViewStartY, fromViewEndY);
+            fromAnim.setDuration(duration);
+            ObjectAnimator toAnim = ObjectAnimator.ofFloat(toView, "y",
+                    toViewStartY, toViewEndY);
+            fromAnim.setDuration(duration);
+            mStateAnimation.playTogether(toolbarHideAnim, fromAnim, toAnim);
 
             // Show the new toolbar buttons just as the main animation is ending
             final int fadeInTime = res.getInteger(R.integer.config_toolbarButtonFadeInTime);