diff options
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewWidget.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index a3d8f8d40..dc2402214 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -669,6 +669,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen 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; diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index f78aa4ca1..a6ea78f46 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -141,8 +141,8 @@ public class PagedViewWidget extends LinearLayout { 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; |