Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow overridding the exitPip destination bounds" into tm-dev am: 15adfe3917 am: e9fb625068

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

Change-Id: Id52ec015257329442c92c183e84f1ca940086ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jorge Gil
2022-05-26 07:58:09 +00:00
committed by Automerger Merge Worker
parent bda0a274ad e9fb625068
commit 3436b9ac09
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);