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

Merge "Don't send redundant WCT for exit-pip finishTransition" into tm-qpr-dev am: 11062d84c9

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

Change-Id: Ib88136f52ac9c8a5c5af25f0eea22c1b858b1cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-05-12 18:34:15 +00:00
committed by Automerger Merge Worker
parent eea0d9206e 11062d84c9
commit 85d0e2c9c9
1 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -336,11 +336,27 @@ public class PipTransition extends PipTransitionController {
// (likely a remote like launcher), so don't fire the finish-callback here -- wait until // (likely a remote like launcher), so don't fire the finish-callback here -- wait until
// the exit transition is merged. // the exit transition is merged.
if ((mExitTransition == null || isAnimatingLocally()) && mFinishCallback != null) { if ((mExitTransition == null || isAnimatingLocally()) && mFinishCallback != null) {
WindowContainerTransaction wct = new WindowContainerTransaction(); WindowContainerTransaction wct = null;
prepareFinishResizeTransaction(taskInfo, destinationBounds, if (isOutPipDirection(direction)) {
direction, wct); // Only need to reset surface properties. The server-side operations were already
if (tx != null) { // done at the start.
wct.setBoundsChangeTransaction(taskInfo.token, tx); if (tx != null) {
mFinishTransaction.merge(tx);
}
} else {
wct = new WindowContainerTransaction();
if (isInPipDirection(direction)) {
// If we are animating from fullscreen using a bounds animation, then reset the
// activity windowing mode, and set the task bounds to the final bounds
wct.setActivityWindowingMode(taskInfo.token, WINDOWING_MODE_UNDEFINED);
wct.scheduleFinishEnterPip(taskInfo.token, destinationBounds);
wct.setBounds(taskInfo.token, destinationBounds);
} else {
wct.setBounds(taskInfo.token, null /* bounds */);
}
if (tx != null) {
wct.setBoundsChangeTransaction(taskInfo.token, tx);
}
} }
final SurfaceControl leash = mPipOrganizer.getSurfaceControl(); final SurfaceControl leash = mPipOrganizer.getSurfaceControl();
final int displayRotation = taskInfo.getConfiguration().windowConfiguration final int displayRotation = taskInfo.getConfiguration().windowConfiguration
@@ -876,27 +892,4 @@ public class PipTransition extends PipTransitionController {
mPipMenuController.movePipMenu(null, null, destinationBounds); mPipMenuController.movePipMenu(null, null, destinationBounds);
mPipMenuController.updateMenuBounds(destinationBounds); mPipMenuController.updateMenuBounds(destinationBounds);
} }
private void prepareFinishResizeTransaction(TaskInfo taskInfo, Rect destinationBounds,
@PipAnimationController.TransitionDirection int direction,
WindowContainerTransaction wct) {
Rect taskBounds = null;
if (isInPipDirection(direction)) {
// If we are animating from fullscreen using a bounds animation, then reset the
// activity windowing mode set by WM, and set the task bounds to the final bounds
taskBounds = destinationBounds;
wct.setActivityWindowingMode(taskInfo.token, WINDOWING_MODE_UNDEFINED);
wct.scheduleFinishEnterPip(taskInfo.token, destinationBounds);
} else if (isOutPipDirection(direction)) {
// If we are animating to fullscreen, then we need to reset the override bounds
// on the task to ensure that the task "matches" the parent's bounds.
taskBounds = (direction == TRANSITION_DIRECTION_LEAVE_PIP)
? null : destinationBounds;
wct.setWindowingMode(taskInfo.token, getOutPipWindowingMode());
// Simply reset the activity mode set prior to the animation running.
wct.setActivityWindowingMode(taskInfo.token, WINDOWING_MODE_UNDEFINED);
}
wct.setBounds(taskInfo.token, taskBounds);
}
} }