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

Commit 90054fd7 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "[1/n] Freeze rotation for SCM activities in desktop mode" into main

parents 717ec7c7 ce5c8fcd

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

+4 −1
Original line number Diff line number Diff line
@@ -228,7 +228,10 @@ class AppCompatSizeCompatModePolicy { 
        int rotation = newParentConfiguration.windowConfiguration.getRotation();

        final boolean isFixedToUserRotation = mActivityRecord.mDisplayContent == null

                || mActivityRecord.mDisplayContent.getDisplayRotation().isFixedToUserRotation();

        if (!isFixedToUserRotation && !appCompatDisplayInsets.mIsFloating) {

        // Ignore parent rotation for floating tasks as window rotation is independent of its parent

        // and thus will remain, and so should be reconfigured, in its original rotation.

        if (!isFixedToUserRotation

                && !newParentConfiguration.windowConfiguration.tasksAreFloating()) {

            // Use parent rotation because the original display can be rotated.

            resolvedConfig.windowConfiguration.setRotation(rotation);

        } else {