Merge "Do not calculate rotated override bounds for organized tasks" into sc-v2-dev am: 017a2a88c1 am: a85e702be4

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

Change-Id: Iac485cdce35ef0585cfad8e91857d75b49413871
This commit is contained in:
TreeHugger Robot
2021-09-10 04:19:49 +00:00
committed by Automerger Merge Worker

View File

@@ -1990,14 +1990,7 @@ class Task extends TaskFragment {
taskDisplayArea.onRootTaskWindowingModeChanged(this);
}
if (mDisplayContent == null) {
return;
}
// Use override windowing mode to prevent extra bounds changes if inheriting the mode.
final int overrideWindowingMode = getRequestedOverrideWindowingMode();
if (overrideWindowingMode != WINDOWING_MODE_PINNED
&& !getRequestedOverrideBounds().isEmpty()) {
if (!isOrganized() && !getRequestedOverrideBounds().isEmpty() && mDisplayContent != null) {
// If the parent (display) has rotated, rotate our bounds to best-fit where their
// bounds were on the pre-rotated display.
final int newRotation = getWindowConfiguration().getRotation();