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

Commit 2f3eb4f1 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Limit fixed orientation letterbox to split screen and fullscreen on... 

Merge "Limit fixed orientation letterbox to split screen and fullscreen on task level." into sc-dev am: 5ec89fed

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

Change-Id: Ibc4b98fe735e61e743f562405a378e6976317e63
parents 851f23c5 5ec89fed

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

+8 −4
Original line number Diff line number Diff line
@@ -7008,12 +7008,16 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            newParentConfiguration = mTmpConfig;

        }



        final int windowingMode = getWindowingMode();

        // Can't use resolvedConfig.windowConfiguration.getWindowingMode() because it can be

        // different from windowing mode of the task (PiP) during transition from fullscreen to PiP

        // and back which can cause visible issues (see b/184078928).

        final int parentWindowingMode =

                newParentConfiguration.windowConfiguration.getWindowingMode();

        // TODO(b/181207944): Consider removing the if condition and always run

        // resolveFixedOrientationConfiguration() since this should be applied for all cases.

        if (isSplitScreenWindowingMode(windowingMode)

                || windowingMode == WINDOWING_MODE_MULTI_WINDOW

                || windowingMode == WINDOWING_MODE_FULLSCREEN) {

        if (isSplitScreenWindowingMode(parentWindowingMode)

                || parentWindowingMode == WINDOWING_MODE_MULTI_WINDOW

                || parentWindowingMode == WINDOWING_MODE_FULLSCREEN) {

            resolveFixedOrientationConfiguration(newParentConfiguration);

        }