Merge "Fix CellLayout cast exception when drag is canceled" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-12 12:24:06 +00:00
committed by Android (Google) Code Review

View File

@@ -1922,6 +1922,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();