Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b844ba7b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not calculate rotated override bounds for organized tasks" into... 

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

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

Change-Id: Iac485cdce35ef0585cfad8e91857d75b49413871
parents 91acbd2a a85e702b

services/core/java/com/android/server/wm/Task.java

+1 −8
Original line number Diff line number Diff line
@@ -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();