commit bf9d6326808aa796c90a06288bde9e4dfb3f9909
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 12 12:38:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 12 12:38:51 2021 +0000
tree 5bd1963a5949c678dc74c1cf31059e3efacc9ddf
parent cdc4789db83921beba892fdb81f27e54fc4ac9ad
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: I5cda3e429ac2e19701667547953f1e14024a4e0c

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