From 232decb008661d82ed2ca6d5f3080ee5a50d3be1 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Wed, 28 Mar 2012 15:09:05 -0700
Subject: Fixing issue where flinging-to-delete from a folder does not
 reflow/close the folder. (Bug 6240540)

Change-Id: I0d442761048c05110b079916eea7c0dcfbaf9759
---
 src/com/android/launcher2/DragController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/com/android/launcher2/DragController.java')

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 5a8617cfe..eba89e536 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -652,7 +652,6 @@ public class DragController {
 
         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 @@ public class DragController {
         // 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,
-- 
cgit v1.2.3