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

src/com/android/launcher2/PagedView.java

@@ -766,8 +766,8 @@ public abstract class PagedView extends ViewGroup {
                 // 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

@@ -1660,7 +1660,7 @@ public class Workspace extends SmoothPagedView
                         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);