commit e22a8e9d3eafe569fe0f4d284c77af08c6e2fe28
author Winson Chung <winsonc@google.com> Fri Nov 12 13:40:58 2010 -0800
committer Winson Chung <winsonc@google.com> Mon Nov 15 13:44:42 2010 -0800
tree 9193ade5a266e87dcb600739ba3e5b90f12894d8
parent cbbaf9862aa160c5e397cb49b554de20981a35fe

Minor fixes to Launcher

- Adding checks to prevent multiple onSetAlpha's to be called (especially now that we are using display lists)
- Removing an old change to keep artificially make the last page wider
- Fixing issue where you could click on an item in the paged view while the page it was on is being faded out

Change-Id: I9b194565602b5200c0688da2caec9c3c829b3bb0

src/com/android/launcher2/CustomizePagedView.java

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 1763a00..a0e3528 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -303,9 +303,10 @@
 
     @Override
     public void onClick(View v) {
-        if (!v.isInTouchMode()) {
-            return;
-        }
+        // Return early if this is not initiated from a touch
+        if (!v.isInTouchMode()) return;
+        // Return early if we are still animating the pages
+        if (mNextPage == INVALID_PAGE) return;
 
         // On certain pages, we allow single tap to mark items as selected so that they can be
         // dropped onto the mini workspaces
@@ -368,9 +369,10 @@
 
     @Override
     public boolean onLongClick(View v) {
-        if (!v.isInTouchMode()) {
-            return false;
-        }
+        // Return early if this is not initiated from a touch
+        if (!v.isInTouchMode()) return false;
+        // Return early if we are still animating the pages
+        if (mNextPage == INVALID_PAGE) return false;
 
         // End the current choice mode before we start dragging anything
         if (isChoiceMode(CHOICE_MODE_SINGLE)) {
@@ -604,17 +606,9 @@
             layout.setPadding(mPageLayoutPaddingLeft, mPageLayoutPaddingTop,
                     mPageLayoutPaddingRight, mPageLayoutPaddingBottom);
 
-            // Temporary change to prevent the last page from being too small (and items bleeding
-            // onto it).  We can remove this once we properly fix the fading algorithm
-            if (i < numPages - 1) {
-                addView(layout, new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.WRAP_CONTENT,
-                        LinearLayout.LayoutParams.MATCH_PARENT));
-            } else {
-                addView(layout, new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.MATCH_PARENT));
-            }
+            addView(layout, new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.MATCH_PARENT));
         }
     }
 
@@ -665,17 +659,9 @@
             layout.setPadding(mPageLayoutPaddingLeft, mPageLayoutPaddingTop,
                     mPageLayoutPaddingRight, mPageLayoutPaddingBottom);
 
-            // Temporary change to prevent the last page from being too small (and items bleeding
-            // onto it).  We can remove this once we properly fix the fading algorithm
-            if (i < numPages - 1) {
-                addView(layout, new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.WRAP_CONTENT,
-                        LinearLayout.LayoutParams.MATCH_PARENT));
-            } else {
-                addView(layout, new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.MATCH_PARENT));
-            }
+            addView(layout, new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.MATCH_PARENT));
         }
     }