Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cf412ca authored by Tony's avatar Tony
Browse files

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
parent 6e74e899

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

+1 −1
Original line number Diff line number Diff line
@@ -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)