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

Commit 15adfe39 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Allow overridding the exitPip destination bounds" into tm-dev

parents aa6bb0ad 27e49907

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+6 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            }

        }



        final Rect destinationBounds = mPipBoundsState.getDisplayBounds();

        final Rect destinationBounds = getExitDestinationBounds();

        final int direction = syncWithSplitScreenBounds(destinationBounds, requestEnterSplit)

                ? TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN

                : TRANSITION_DIRECTION_LEAVE_PIP;
@@ -486,6 +486,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        });

    }



    /** Returns the bounds to restore to when exiting PIP mode. */

    public Rect getExitDestinationBounds() {

        return mPipBoundsState.getDisplayBounds();

    }



    private void exitLaunchIntoPipTask(WindowContainerTransaction wct) {

        wct.startTask(mTaskInfo.launchIntoPipHostTaskId, null /* ActivityOptions */);

        mTaskOrganizer.applyTransaction(wct);