Don't attempt to add item back to folder when deferring drag.

am: 1cf412ca91 Change-Id: Ic8bf5568b9811558bf20fac721b17dfa80803e8a
2016-09-26 20:59:51 +00:00
parent 5eea1e89dd 1cf412ca91
commit 8c855cb8c0
1 changed files with 1 additions and 1 deletions
@@ -916,7 +916,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
            if (mDeleteFolderOnDropCompleted && !mItemAddedBackToSelfViaIcon && target != this) {
                replaceFolderWithFinalItem();
            }
-        } else {
+        } else if (!mDragController.isDeferringDrag()) {
            // The drag failed, we need to return the item to the folder
            ShortcutInfo info = (ShortcutInfo) d.dragInfo;
            View icon = (mCurrentDragView != null && mCurrentDragView.getTag() == info)