commit dc0966d7fa1d031158e9834fda3bdf28658a1991
author Adam Cohen <adamcohen@google.com> Tue May 29 17:59:00 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 29 17:59:00 2012 -0700
tree 2852e52ede92b2cc9336c18ef3a22294aaf8818a
parent 229a872a204c1ee259b9275696ef4f09b0a8e488
parent 725c873c0340bd92f805bc4a365214ff118b0bb0

am 725c873c: am 7afa902b: Fix issue where item gets added to folder when displacing folder (issue 6576460)

* commit '725c873c0340bd92f805bc4a365214ff118b0bb0':
  Fix issue where item gets added to folder when displacing folder (issue 6576460)

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index e906733..ba51889 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2839,7 +2839,6 @@
 
         if (willAddToFolder && mDragMode == DRAG_MODE_NONE) {
             mDragOverFolderIcon = ((FolderIcon) dragOverView);
-            mAddToExistingFolderOnDrop = true;
             mDragOverFolderIcon.onDragEnter(info);
             if (targetLayout != null) {
                 targetLayout.clearDragOutlines();