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

This commit is contained in:
Jorge Gil
2022-05-24 22:16:39 +00:00
committed by Android (Google) Code Review

View File

@@ -434,7 +434,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;
@@ -489,6 +489,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);