Disable multitouch to prevent crash in all apps and frozen workspace while dragging.

Change-Id: I813e0294a9e3b73f43922d8cd6896e71f3664429

diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java
index 76a6900..0d0a339 100644 (file)
--- a/src/com/android/launcher2/CellLayoutChildren.java
+++ b/src/com/android/launcher2/CellLayoutChildren.java
@@ -45,6 +45,9 @@ public class CellLayoutChildren extends ViewGroup {
         super(context);
         mWallpaperManager = WallpaperManager.getInstance(context);
         setLayerType(LAYER_TYPE_HARDWARE, null);
+
+        // Disable multitouch for the workspace
+        setMotionEventSplittingEnabled(false);
     }
 
     public void setCellDimensions(int cellWidth, int cellHeight,

diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index b418a79..a9dd7e3 100644 (file)
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -40,6 +40,9 @@ public class DragLayer extends FrameLayout {
      */
     public DragLayer(Context context, AttributeSet attrs) {
         super(context, attrs);
+
+        // Disable multitouch across the workspace/all apps/customize tray
+        setMotionEventSplittingEnabled(false);
     }
 
     public void setDragController(DragController controller) {