From: Michael Jurka <mikejurka@google.com>
Date: Fri, 4 Feb 2011 02:20:25 +0000 (-0800)
Subject: Fixed issue where all apps animation wasn't happening
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=11148e516524754e211e1a1e5e79d19b7d1a42a7;p=android-x86%2Fpackages-apps-Trebuchet.git

Fixed issue where all apps animation wasn't happening

-Fixes issue caused by performance tweak https://android-git.corp.google.com/g/#change,94997
---

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6f4074882..b7cad9f01 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2675,9 +2675,6 @@ public final class Launcher extends Activity
         }
 
         if (animated) {
-            final float oldScaleX = toView.getScaleX();
-            final float oldScaleY = toView.getScaleY();
-
             ValueAnimator scaleAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration);
             scaleAnim.setInterpolator(new Workspace.ZoomOutInterpolator());
             scaleAnim.addUpdateListener(new AnimatorUpdateListener() {
@@ -2685,8 +2682,8 @@ public final class Launcher extends Activity
                     final float b = (Float) animation.getAnimatedValue();
                     final float a = 1f - b;
                     ((View) toView.getParent()).fastInvalidate();
-                    toView.setFastScaleX(a * oldScaleX + b * 1f);
-                    toView.setFastScaleY(a * oldScaleY + b * 1f);
+                    toView.setFastScaleX(a * scale + b * 1f);
+                    toView.setFastScaleY(a * scale + b * 1f);
                 }
             });