diff options
| author | Winson Chung <winsonc@google.com> | 2011-02-23 16:16:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-23 16:16:12 -0800 |
| commit | 44316458da2b79c0a02acb1c4a6d2ae8dd558a3b (patch) | |
| tree | 5541ab2f32ef1a7f4d41846714b8a233bc17feb7 /src/com/android | |
| parent | 6ab0041f8a9f0ca6b52d36600847aa94a53e2a5f (diff) | |
| parent | c35afb2c9df8cc56c77bf21ce2eaa213f6f31251 (diff) | |
| download | android_packages_apps_Trebuchet-44316458da2b79c0a02acb1c4a6d2ae8dd558a3b.tar.gz android_packages_apps_Trebuchet-44316458da2b79c0a02acb1c4a6d2ae8dd558a3b.tar.bz2 android_packages_apps_Trebuchet-44316458da2b79c0a02acb1c4a6d2ae8dd558a3b.zip | |
Merge "Restoring split touch events in workspace with workaround."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/CellLayoutChildren.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java index 0d0a33907..76a690094 100644 --- a/src/com/android/launcher2/CellLayoutChildren.java +++ b/src/com/android/launcher2/CellLayoutChildren.java @@ -45,9 +45,6 @@ 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/Workspace.java b/src/com/android/launcher2/Workspace.java index c2063abd6..38471df00 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -262,6 +262,9 @@ public class Workspace extends SmoothPagedView setHapticFeedbackEnabled(false); initWorkspace(); + + // Disable multitouch across the workspace/all apps/customize tray + setMotionEventSplittingEnabled(true); } /** |