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

Merge "Fix black screen while pip to split screen" into sc-dev

Browse Source
This commit is contained in:
Tony Huang
2021-04-01 06:35:50 +00:00
committed by Android (Google) Code Review
parent 0aa964394e 71784f2ad4
commit c8b7266594
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,9 +540,10 @@ public class PipAnimationController {
// WindowContainerTransaction in task organizer // WindowContainerTransaction in task organizer
final Rect destBounds = getDestinationBounds(); final Rect destBounds = getDestinationBounds();
getSurfaceTransactionHelper().resetScale(tx, leash, destBounds); getSurfaceTransactionHelper().resetScale(tx, leash, destBounds);
if (transitionDirection == TRANSITION_DIRECTION_LEAVE_PIP) { if (isOutPipDirection(transitionDirection)) {
// Leaving to fullscreen, reset crop to null. // Exit pip, clear scale, position and crop.
tx.setPosition(leash, destBounds.left, destBounds.top); tx.setMatrix(leash, 1, 0, 0, 1);
tx.setPosition(leash, 0, 0);
tx.setWindowCrop(leash, 0, 0); tx.setWindowCrop(leash, 0, 0);
} else { } else {
getSurfaceTransactionHelper().crop(tx, leash, destBounds); getSurfaceTransactionHelper().crop(tx, leash, destBounds);

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

@@ -1016,10 +1016,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED); wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);
wct.scheduleFinishEnterPip(mToken, destinationBounds); wct.scheduleFinishEnterPip(mToken, destinationBounds);
} else if (isOutPipDirection(direction)) { } else if (isOutPipDirection(direction)) {
// If we are animating to fullscreen, then we need to reset the override bounds // If we are animating to fullscreen or split screen, then we need to reset the
// on the task to ensure that the task "matches" the parent's bounds. // override bounds on the task to ensure that the task "matches" the parent's bounds.
taskBounds = (direction == TRANSITION_DIRECTION_LEAVE_PIP) taskBounds = null;
? null : destinationBounds;
applyWindowingModeChangeOnExit(wct, direction); applyWindowingModeChangeOnExit(wct, direction);
} else { } else {
// Just a resize in PIP // Just a resize in PIP