commit 2c4cf411f6c30fb2bfb47d2b13b680bda7a266dc
author Winson Chung <winsonc@google.com> Tue May 08 14:03:21 2012 -0700
committer Winson Chung <winsonc@google.com> Tue May 08 14:03:59 2012 -0700
tree 051c4fc8abb315cb0586608c51174f07abf622c2
parent c843ca452a2c1667310246bf85c8eb50656ab7a6

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

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 36913ca..e8f1ac9 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -978,6 +978,7 @@
             if (d.dragView.hasDrawn()) {
                 mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView);
             } else {
+                d.deferDragViewCleanupPostAnimation = false;
                 mCurrentDragView.setVisibility(VISIBLE);
             }
             mItemsInvalidated = true;