commit c110e2718fa93b4663d493387ecd8602170dfa36
author Adam Cohen <adamcohen@google.com> Mon Nov 21 21:12:16 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 21:12:16 2011 -0800
tree ee58d051a9bf05de1c7fe2c8b77f70569d411b5c
parent 98f737bc54f8610a4225f5b364b1827dfb52789f
parent 9a03678e12909c663ee856976d50fd38c8ab6945

am 9a03678e: am cfcc1f9d: am 07f920ed: Merge "Fix issue 5639994: disabled multi-touch on folders" into ics-mr1

* commit '9a03678e12909c663ee856976d50fd38c8ab6945':
  Fix issue 5639994: disabled multi-touch on folders

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index a6757d7..fdde4d5 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -156,6 +156,7 @@
         super.onFinishInflate();
         mContent = (CellLayout) findViewById(R.id.folder_content);
         mContent.setGridSize(0, 0);
+        mContent.getChildrenLayout().setMotionEventSplittingEnabled(false);
         mFolderName = (FolderEditText) findViewById(R.id.folder_name);
         mFolderName.setFolder(this);
         mFolderName.setOnFocusChangeListener(this);