commit 76f5572648fa84d2ee7c7a6ff0cdcd498173648e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 12 12:24:06 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 12 12:24:06 2021 +0000
tree a0db26a4d243a52d0502d29217bae041915282da
parent d88f5728645c114635f3d0b193dcb499cd737a38
parent 77a1393c4484a78da20cc3943ed3221976e68a93

Merge "Fix CellLayout cast exception when drag is canceled" 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 17c8edc..2e1cc58 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1922,6 +1922,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();