Merge "Allow overridding the exitPip destination bounds" into tm-dev
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user