commit 31abc291deb7a8879fc2ef675814efdb6fa9d56f
author Sunny Goyal <sunnygoyal@google.com> Fri May 01 10:42:32 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri May 01 10:43:25 2015 -0700
tree 90aa9ec6c3d2e257169a965f7afff6c818be9dae
parent 111c83579a165fe9d8f915cda4e08de47e16c056

Clearing drag state after the close animation is complete

Bug: 19350802
Change-Id: I048dfa2743692c6c7d56dcacab900ec2d17504ed

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index e0aecea..ed8eea7 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -704,9 +704,15 @@
         if (mInfo.opened) {
             mLauncher.closeFolder();
             mRearrangeOnClose = true;
+        } else if (mState == STATE_ANIMATING) {
+            mRearrangeOnClose = true;
         } else {
             rearrangeChildren();
+            clearDragInfo();
         }
+    }
+
+    private void clearDragInfo() {
         mCurrentDragInfo = null;
         mCurrentDragView = null;
         mSuppressOnAdd = false;
@@ -1037,6 +1043,7 @@
             }
         }
         mSuppressFolderDeletion = false;
+        clearDragInfo();
     }
 
     @Thunk void replaceFolderWithFinalItem() {