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

Commit 44925d14 authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Always override screenHeightDp and screenWidthDp 

Taking the minimum of screenHeightDp will result in taking the parent
configuration's screenHeightDp and configuration will stay landscape.

Bug: 332758932
Test: manual
Change-Id: I81b7a55e4659818dab8f4ee10c71ee9224595028
parent 8834639a

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

+7 −11
Original line number Diff line number Diff line
@@ -8634,15 +8634,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (mDisplayContent == null) {

            return;

        }

        final Rect parentAppBounds = newParentConfiguration.windowConfiguration.getAppBounds();

        final Rect parentBounds = newParentConfiguration.windowConfiguration.getBounds();

        int rotation = newParentConfiguration.windowConfiguration.getRotation();

        if (rotation == ROTATION_UNDEFINED && !isFixedRotationTransforming()) {

            rotation = mDisplayContent.getRotation();

        }

        if (!mResolveConfigHint.mUseOverrideInsetsForStableBounds

                || getCompatDisplayInsets() != null

                || isFloating(parentWindowingMode) || parentAppBounds == null

                || parentAppBounds.isEmpty() || rotation == ROTATION_UNDEFINED) {

                || getCompatDisplayInsets() != null || isFloating(parentWindowingMode)

                || rotation == ROTATION_UNDEFINED) {

            // If the insets configuration decoupled logic is not enabled for the app, or the app

            // already has a compat override, or the context doesn't contain enough info to

            // calculate the override, skip the override.
@@ -8661,7 +8660,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // the value if not calculated yet.

        Rect outAppBounds = inOutConfig.windowConfiguration.getAppBounds();

        if (outAppBounds == null || outAppBounds.isEmpty()) {

            inOutConfig.windowConfiguration.setAppBounds(parentAppBounds);

            inOutConfig.windowConfiguration.setAppBounds(parentBounds);

            outAppBounds = inOutConfig.windowConfiguration.getAppBounds();

            outAppBounds.inset(nonDecorInsets);

        }
@@ -8672,14 +8671,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        density *= DisplayMetrics.DENSITY_DEFAULT_SCALE;

        if (inOutConfig.screenWidthDp == Configuration.SCREEN_WIDTH_DP_UNDEFINED) {

            final int overrideScreenWidthDp = (int) (outAppBounds.width() / density + 0.5f);

            inOutConfig.screenWidthDp =

                    Math.min(overrideScreenWidthDp, newParentConfiguration.screenWidthDp);

            inOutConfig.screenWidthDp = overrideScreenWidthDp;

        }

        if (inOutConfig.screenHeightDp == Configuration.SCREEN_HEIGHT_DP_UNDEFINED) {

            final int overrideScreenHeightDp =

                    (int) (outAppBounds.height() / density + 0.5f);

            inOutConfig.screenHeightDp =

                    Math.min(overrideScreenHeightDp, newParentConfiguration.screenHeightDp);

            final int overrideScreenHeightDp = (int) (outAppBounds.height() / density + 0.5f);

            inOutConfig.screenHeightDp = overrideScreenHeightDp;

        }

        if (inOutConfig.smallestScreenWidthDp

                == Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED