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

Commit 1d44d5cb authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "DragToDesktopTransitionHandler: Set DoNotPip on finishCallback." into main

parents 887c4377 24f4c591

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt

+4 −1
Original line number Diff line number Diff line
@@ -281,7 +281,10 @@ sealed class DragToDesktopTransitionHandler( 
            val wct = WindowContainerTransaction()

            restoreWindowOrder(wct, state)

            state.startTransitionFinishTransaction?.apply()

            state.startTransitionFinishCb?.onTransitionFinished(/* wct= */ null)

            val finishWCT = WindowContainerTransaction()

            val taskInfo = state.draggedTaskChange?.taskInfo ?: error("Expected non-null taskInfo")

            finishWCT.setDoNotPip(taskInfo.token)

            state.startTransitionFinishCb?.onTransitionFinished(finishWCT)

            requestSplitFromScaledTask(splitPosition, wct)

            clearState()

        } else if (