commit 44316458da2b79c0a02acb1c4a6d2ae8dd558a3b
author Winson Chung <winsonc@google.com> Wed Feb 23 16:16:12 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 23 16:16:12 2011 -0800
tree 5541ab2f32ef1a7f4d41846714b8a233bc17feb7
parent 6ab0041f8a9f0ca6b52d36600847aa94a53e2a5f
parent c35afb2c9df8cc56c77bf21ce2eaa213f6f31251

Merge "Restoring split touch events in workspace with workaround."

src/com/android/launcher2/CellLayoutChildren.java

diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java
index 0d0a339..76a6900 100644
--- a/src/com/android/launcher2/CellLayoutChildren.java
+++ b/src/com/android/launcher2/CellLayoutChildren.java
@@ -45,9 +45,6 @@
         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,

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index c2063ab..38471df 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -262,6 +262,9 @@
         setHapticFeedbackEnabled(false);
 
         initWorkspace();
+
+        // Disable multitouch across the workspace/all apps/customize tray
+        setMotionEventSplittingEnabled(true);
     }
 
     /**