Merge "Fix split black if active from pip" into sc-v2-dev am: cfcfa22395

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

Change-Id: I49c60f5e4d5ef1e71e1e41eb655cf2e76deda677
This commit is contained in:
TreeHugger Robot
2021-11-30 15:37:57 +00:00
committed by Automerger Merge Worker

View File

@@ -1255,11 +1255,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
} else if (isOutPipDirection(direction)) { } else if (isOutPipDirection(direction)) {
// If we are animating to fullscreen or split screen, then we need to reset the // If we are animating to fullscreen or split screen, then we need to reset the
// override bounds 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.
if (direction == TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN) { taskBounds = null;
taskBounds = destinationBounds;
} else {
taskBounds = null;
}
applyWindowingModeChangeOnExit(wct, direction); applyWindowingModeChangeOnExit(wct, direction);
} else { } else {
// Just a resize in PIP // Just a resize in PIP