commit b8c663c492d32963b6ee33750fc985f037c58f10
author Sunny Goyal <sunnygoyal@google.com> Thu Apr 23 11:43:48 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Apr 23 16:32:10 2015 -0700
tree 015714b7543f671222a6b90d2ac49e4de6560e95
parent 3748c5e73107fbfb8bd315653336083578c49026

Moving item to its old position in folder if DnD is cancelled

Change-Id: I6362ef23b346409e8517a03e63dee974294a3a18

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index c35ce94..dff47c2 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -745,9 +745,18 @@
                 replaceFolderWithFinalItem();
             }
         } else {
-            rearrangeChildren();
             // The drag failed, we need to return the item to the folder
+            ShortcutInfo info = (ShortcutInfo) d.dragInfo;
+            View icon = (mCurrentDragView != null && mCurrentDragView.getTag() == info)
+                    ? mCurrentDragView : mContent.createNewView(info);
+            ArrayList<View> views = getItemsInReadingOrder();
+            views.add(info.rank, icon);
+            mContent.arrangeChildren(views, views.size());
+            mItemsInvalidated = true;
+
+            mSuppressOnAdd = true;
             mFolderIcon.onDrop(d);
+            mSuppressOnAdd = false;
         }
 
         if (target != this) {