commit 97c60ae3134dd86ea8c07c7fa19c2f54696c1456
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 16 22:49:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 16 22:49:34 2021 +0000
tree 40261ce836586357d5ba03622bd6d38f68cc1b21
parent 95707aa4ed2a840e71f19ae3c2bebc14a771d3c2
parent 2fab58310ad0090f148ed858867a7abf85c595df

Merge "Reattach LauncherAppWidgetHostView to its parent after canceling drag" into sc-dev am: 4176cb33bb am: 2fab58310a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14970490

Change-Id: I2a939b0fd4221e6d0c7ea8f7d4a02ece3038524d

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index aba8a40..a1b1a22 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2838,6 +2838,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) {