commit 83acc755ac17b741fd9088efeed99fcd304071cc
author Sunny Goyal <sunnygoyal@google.com> Thu Aug 28 23:01:34 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 23:01:34 2014 +0000
tree 78b540ed56e418a8a0b6bcc9f6c8e401abd2cbd4
parent 67ef1c406cb8a288c5bcdb825a26e6020e0a6cac
parent 4b02017fa5bdb276347d0b9e8a76a9fdd5bb0eb9

Merge "Clear the draginfo object once the item is dropped inside a folder" into ub-now-porkchop

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 6bd4e0e..a27e519 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1295,6 +1295,8 @@
         mSuppressOnAdd = true;
         mInfo.add(si);
         mSuppressOnAdd = false;
+        // Clear the drag info, as it is no longer being dragged.
+        mCurrentDragInfo = null;
     }
 
     // This is used so the item doesn't immediately appear in the folder when added. In one case