commit 745ec6050b7b5ecfd0ef9cd92112e5dada3a40ab
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 12 12:55:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 12 12:55:20 2021 +0000
tree 8b51a9b2e5dbf83e93806a29051b3acf05b6a70f
parent cc51e3aaa9aea6fcbd9c332ea91c72e63ab83beb
parent c13b47f7bf41a31499247d2f8c526b7be2b283f3

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

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

Change-Id: I77835904fcbef8110d6880566a785999c8d98f79

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