commit c13b47f7bf41a31499247d2f8c526b7be2b283f3
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 12 12:39:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 12 12:39:52 2021 +0000
tree f37fb3a8515b32afb26f12ce126535dfe3a30b0a
parent a51ef571add64065836c06e5c774529d96132d8e
parent 76f5572648fa84d2ee7c7a6ff0cdcd498173648e

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

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

Change-Id: I4d23a6d0cc1806761bf9655ba8d823813ec8b630

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();