commit ef6c04633c8d5610f783e459d1d209955ce537af
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 27 03:11:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 03:11:07 2016 +0000
tree fc1124e3a3fc2d0e268af9c01d4e089eb8588226
parent 1cf412ca91315cb60912033c0013706e5cced072
parent eeb712f1117cb7f7d372ac7c8d22dce2d3d76f40

Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary-polish

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index a666b56..ebbe641 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -916,7 +916,7 @@
             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)