Fixing issue where flinging-to-delete from a folder does not reflow/close the folder. (Bug 6240540)

Change-Id: I0d442761048c05110b079916eea7c0dcfbaf9759
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 5a8617c..eba89e5 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -652,7 +652,6 @@
 
         mDragObject.x = coordinates[0];
         mDragObject.y = coordinates[1];
-        mDragObject.dragComplete = true;
 
         // Clean up dragging on the target if it's not the current fling delete target otherwise,
         // start dragging to it.
@@ -663,6 +662,9 @@
         // Drop onto the fling-to-delete target
         boolean accepted = false;
         mFlingToDeleteDropTarget.onDragEnter(mDragObject);
+        // We must set dragComplete to true _only_ after we "enter" the fling-to-delete target for
+        // "drop"
+        mDragObject.dragComplete = true;
         mFlingToDeleteDropTarget.onDragExit(mDragObject);
         if (mFlingToDeleteDropTarget.acceptDrop(mDragObject)) {
             mFlingToDeleteDropTarget.onFlingToDelete(mDragObject, mDragObject.x, mDragObject.y,