From 2c4cf411f6c30fb2bfb47d2b13b680bda7a266dc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 8 May 2012 14:03:21 -0700
Subject: [PATCH] Do not defer removing the drag view if we don't animate the
 item back into the folder. (Bug 6249514)

Change-Id: I40c47d9320158ec5ba4b4663316ecee488a61876
---
 src/com/android/launcher2/Folder.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 36913ca6ad..e8f1ac96ba 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -978,6 +978,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
             if (d.dragView.hasDrawn()) {
                 mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView);
             } else {
+                d.deferDragViewCleanupPostAnimation = false;
                 mCurrentDragView.setVisibility(VISIBLE);
             }
             mItemsInvalidated = true;