commit d4ca056ba68156c1c1c59cf9c1fed2944d24d0dd
author Winson Chung <winsonc@google.com> Wed May 09 01:55:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 09 01:55:34 2012 -0700
tree 9997a8618cc6811542917cf1a486e8ed18771c43
parent 79a3560f5c2371d50944fc0ad7be6a453fae47fe
parent 7112d5dbdf1861227499ecb509b1a12343215f92

am 7112d5db: Merge "Do not defer removing the drag view if we don\'t animate the item back into the folder. (Bug 6249514)" into jb-dev

* commit '7112d5dbdf1861227499ecb509b1a12343215f92':
  Do not defer removing the drag view if we don't animate the item back into the folder. (Bug 6249514)

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;