| commit | 29833a51f3c7a51d8f20abd120d35c17bec09b8d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 30 15:37:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 30 15:37:57 2021 +0000 |
| tree | 4aa96c3f11a047b5ffd41f79f28a241660cceb6f | |
| parent | 6af225420340fabeab36f424ee266f9f55397ff0 [diff] | |
| parent | cfcfa22395eb252d1a78a97375bc8cc1bd33125d [diff] |
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
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 c2ebc30..854fc60e 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 @@ } 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