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

Commit c50a3364 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Use the TaskFragment override screenLayout for fix rotation" into tm-qpr-dev am: 1f2487e2 

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



Change-Id: If90334afd24b26761b8b5c2292606a9f30a797e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78db0fd8 1f2487e2

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

+7 −1
Original line number Diff line number Diff line
@@ -448,8 +448,14 @@ class WindowToken extends WindowContainer<WindowState> { 
        if (mFixedRotationTransformState != null) {

            mFixedRotationTransformState.disassociate(this);

        }

        // TODO(b/233855302): Remove TaskFragment override if the DisplayContent uses the same

        //  bounds for screenLayout calculation.

        final Configuration overrideConfig = new Configuration(config);

        overrideConfig.screenLayout = TaskFragment.computeScreenLayoutOverride(

                overrideConfig.screenLayout, overrideConfig.screenWidthDp,

                overrideConfig.screenHeightDp);

        mFixedRotationTransformState = new FixedRotationTransformState(info, displayFrames,

                new Configuration(config), mDisplayContent.getRotation());

                overrideConfig, mDisplayContent.getRotation());

        mFixedRotationTransformState.mAssociatedTokens.add(this);

        mDisplayContent.getDisplayPolicy().simulateLayoutDisplay(displayFrames);

        onFixedRotationStatePrepared();