commit e6abe6c6a70c1e26b7765217e94b1d46b5388079
author Michael Jurka <mikejurka@google.com> Thu Feb 03 20:23:44 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 03 20:23:44 2011 -0800
tree 21822d0578748e46f458ac8a111d196476c4c722
parent 11148e516524754e211e1a1e5e79d19b7d1a42a7
parent c0759f5090d9539d82ddc944b9f2da767c36b251

Merge "Reducing memory impact of hardware layers in Launcher" into honeycomb

res/drawable-xlarge-nodpi/city.jpg

diff --git a/res/drawable-xlarge-nodpi/city.jpg b/res/drawable-xlarge-nodpi/city.jpg
index 57a3223..72beb6b 100644
--- a/res/drawable-xlarge-nodpi/city.jpg
+++ b/res/drawable-xlarge-nodpi/city.jpg
Binary files differ

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6f40748..b7cad9f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2675,9 +2675,6 @@
         }
 
         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 @@
                     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);
                 }
             });