commit c52043e432e67d3618025d4399f5b43a13f9843e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 12 12:54:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 12 12:54:52 2021 +0000
tree 8f0e2e268025529756218ea72074bbbae646154f
parent 10b3d2954be8f8187c9a6101b7806714583ea0b5
parent c86044636da76a9173deb4963dea97e4c7fe9967

Merge "Fix CellLayout cast exception when drag is canceled" into sc-dev am: 76f5572648 am: c86044636d

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

Change-Id: Ie813c78235957215bb502ba9b1d6cb076746ce22

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index fdc69a7..bcddf34 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1926,6 +1926,11 @@
                     CellLayout layout = (CellLayout) cell.getParent().getParent();
                     layout.markCellsAsOccupiedForView(cell);
                 }
+            } else {
+                // When drag is cancelled, reattach content view back to its original parent.
+                if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {
+                    d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
+                }
             }
 
             final CellLayout parent = (CellLayout) cell.getParent().getParent();