commit 4176cb33bb2af68717d1d73f8056e943c942d009
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 16 22:25:41 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 16 22:25:41 2021 +0000
tree 0db7bc0bb9c65e0c413eb22397a2d2114fcd1b14
parent f89c4280b31457faf2b272cbcc4d77be7868e866
parent a5e145377938b589996b86703e03fd396fd36596

Merge "Reattach LauncherAppWidgetHostView to its parent after canceling drag" into sc-dev

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2e1cc58..303bb01 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2791,6 +2791,10 @@
                 removeWorkspaceItem(mDragInfo.cell);
             }
         } else if (mDragInfo != null) {
+            // When drag is cancelled, reattach content view back to its original parent.
+            if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+            }
             final CellLayout cellLayout = mLauncher.getCellLayout(
                     mDragInfo.container, mDragInfo.screenId);
             if (cellLayout != null) {