Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b786ca8 authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev

parents b7e15cf3 92335ed7

src/com/android/launcher3/Workspace.java

+1 −1
Original line number Diff line number Diff line
@@ -2792,7 +2792,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
            }

        } else if (mDragInfo != null) {

            // When drag is cancelled, reattach content view back to its original parent.

            if (mDragInfo.cell instanceof LauncherAppWidgetHostView) {

            if (mDragInfo.cell instanceof LauncherAppWidgetHostView && d.dragView != null) {

                d.dragView.detachContentView(/* reattachToPreviousParent= */ true);

            }

            final CellLayout cellLayout = mLauncher.getCellLayout(