commit 10392b50c9a3e7dc1c1b251ec2e879c25ab21ea6
author Winson Chung <winsonc@google.com> Mon Jan 30 17:53:59 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 30 17:53:59 2012 -0800
tree 0b733b5641c049b121712bbe2fd17ab5285556d7
parent 8a2d3e6a29f3ee009b40904dbd36d2ea622d5750
parent 3b187b88baf80e520f6bd32d60abe6460d28a040

Merge "Fixing issue where AllApps icon would stay dimmed after pressing it (but not launching or long pressing)."

res/layout-sw600dp/market_button.xml

diff --git a/res/layout-sw600dp/market_button.xml b/res/layout-sw600dp/market_button.xml
index 4ccecd9..3252790 100644
--- a/res/layout-sw600dp/market_button.xml
+++ b/res/layout-sw600dp/market_button.xml
@@ -22,6 +22,7 @@
     android:paddingLeft="32dp"
     android:paddingRight="32dp"
     android:drawablePadding="10dp"
+    android:background="@drawable/tab_widget_indicator_selector"
     android:text="@string/market"
     android:contentDescription="@string/market"
     android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"

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);