From 1cf412ca91315cb60912033c0013706e5cced072 Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 23 Sep 2016 18:58:37 -0700 Subject: Don't attempt to add item back to folder when deferring drag. Since the item hasn't yet been removed until the deferred drag starts, adding it again will throw an exception (the view already has a parent). Bug: 30769920 Change-Id: Icb95aaa64e6e3c5dc105bbf3e54460b529d02033 --- src/com/android/launcher3/folder/Folder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index a666b564d..ebbe64127 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -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) -- cgit v1.2.3