commit c93ea442024bb74691048b4cc342322385ac8cf7
author Adam Cohen <adamcohen@google.com> Wed May 16 17:15:26 2012 -0700
committer Adam Cohen <adamcohen@google.com> Wed May 16 17:15:26 2012 -0700
tree 6ecd711c400c93760448e7871680f2b6c8363225
parent 7d816a7d2f350957bd15b370aa65e35fa50b7f44

Yet another attempt to fix (issue 6282761)

Change-Id: Iabb0dd8e59e566ddef71d4aa7aa684f52d06b3b3

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index a3d8f8d..dc24022 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -669,6 +669,12 @@
             return false;
         }
 
+        // This can happen in some weird cases involving multi-touch. We can't start dragging the
+        // widget if this is null, so we break out.
+        if (mCreateWidgetInfo == null) {
+            return false;
+        }
+
         // Compose the drag image
         Bitmap preview;
         Bitmap outline;

src/com/android/launcher2/PagedViewWidget.java

diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index f78aa4c..a6ea78f 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -141,8 +141,8 @@
 
     class CheckForShortPress implements Runnable {
         public void run() {
+            if (sShortpressTarget != null) return;
             if (mShortPressListener != null) {
-                if (sShortpressTarget != null) return;
                 mShortPressListener.onShortPress(PagedViewWidget.this);
             }
             sShortpressTarget = PagedViewWidget.this;