From bf37d2e674c6285ae37c9e6f67d091812f8e9407 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Mon, 29 Nov 2021 16:59:55 +0800 Subject: [PATCH] Fix split black if active from pip When expand from pip, it should set task bounds to null because split always controls split root task bounds rather than child task bounds. Fix: 208174939 Test: manual Test: pass existing tests Change-Id: I6e391442049db9eda0c44f97e3d62ed04616cb93 --- .../src/com/android/wm/shell/pip/PipTaskOrganizer.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index c2ebc3031b938..854fc60e15e8d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -1255,11 +1255,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } else if (isOutPipDirection(direction)) { // 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. - if (direction == TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN) { - taskBounds = destinationBounds; - } else { - taskBounds = null; - } + taskBounds = null; applyWindowingModeChangeOnExit(wct, direction); } else { // Just a resize in PIP