commit 91834235e86f04e0d5d45cdf19e5239c90962a59
author Adam Cohen <adamcohen@google.com> Tue May 29 17:53:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 17:53:05 2012 -0700
tree 631adf301ff844b712f7f645fd6525a67ee316b0
parent 7afa902b6cf1b63aa145ec95bc62757b4f680abd
parent 87a9f5bf6a62a2b877bd2285f91e0300b288e02a

Merge "Fix NPE when widget configuration activity is rotated (issue 6556784)" into jb-dev

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();