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

Commit 3436b9ac authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe39 am: e9fb6250 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606671



Change-Id: Id52ec015257329442c92c183e84f1ca940086ab9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bda0a274 e9fb6250

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

+6 −1
Original line number Original line 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)

        final int direction = syncWithSplitScreenBounds(destinationBounds, requestEnterSplit)

                ? TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN

                ? TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN

                : TRANSITION_DIRECTION_LEAVE_PIP;

                : 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) {

    private void exitLaunchIntoPipTask(WindowContainerTransaction wct) {

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

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

        mTaskOrganizer.applyTransaction(wct);

        mTaskOrganizer.applyTransaction(wct);