commit b33e05fa50a0a386e96acf8dc9b5ccd1ba6834ae
author Winson Chung <winsonc@google.com> Mon Jan 30 12:18:04 2012 -0800
committer Winson Chung <winsonc@google.com> Mon Jan 30 17:20:47 2012 -0800
tree 212ddffa8d892c3884a2854965cfd7e47cc6e503
parent 63f541d52c7e5abc6a076213f62e806480f2026b

Fixing two regressions in which side pages were not drawn or oriented correctly.

Change-Id: Ib936d7701c8962fc04e6fed2e3d624291fe8fc46

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index afee8b0..7abe6e1 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -766,8 +766,8 @@
                 // View.INVISIBLE, preventing re-drawing of their hardware layer
                 for (int i = getChildCount() - 1; i >= 0; i--) {
                     final View v = getPageAt(i);
-                    if (leftScreen <= i && i <= rightScreen &&
-                            v.getAlpha() > ViewConfiguration.ALPHA_THRESHOLD) {
+
+                    if (leftScreen <= i && i <= rightScreen) {
                         v.setVisibility(VISIBLE);
                         drawChild(canvas, v, drawingTime);
                     } else {

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 8d11aa7..4e03b75 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1660,7 +1660,7 @@
                         rotate.setInterpolator(new DecelerateInterpolator(2.0f));
                         rotate.addUpdateListener(new LauncherAnimatorUpdateListener() {
                                 public void onAnimationUpdate(float a, float b) {
-                                    cl.setRotationY(a * 0f + b * 1f);
+                                    cl.setRotationY(a * mOldRotationYs[i] + b * mNewRotationYs[i]);
                                 }
                             });
                         anim.play(rotate);