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
2021-06-12 12:55:20 +00:00
parent cc51e3aaa9 c13b47f7bf
commit 745ec6050b
1 changed files with 5 additions and 0 deletions
@@ -1926,6 +1926,11 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
                    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();