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

Commit 4e7fc325 authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Restrict app to boundsWithInsets to respect orientation 

Portrait displays with close to square bounds can be landscape with
insets. To make sure orientation is respected with insets, we should
use the parentBoundsWithInsets instead of parentBounds.

Test is disabled temporarily as it needs to be fixed in main first.

Bug: 330888878
Test: atest SizeCompatTests
Change-Id: I073120e69e9142e03cc09e352b1f502d1a0d4493
parent 0d383316

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

+4 −4
Original line number Diff line number Diff line
@@ -9035,8 +9035,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            // vertically centered within parent bounds with insets, so position vertical bounds

            // within parent bounds with insets to prevent insets from unnecessarily trimming

            // vertical bounds.

            final int bottom = Math.min(parentBoundsWithInsets.top + parentBounds.width() - 1,

                    parentBoundsWithInsets.bottom);

            final int bottom = Math.min(parentBoundsWithInsets.top

                            + parentBoundsWithInsets.width() - 1, parentBoundsWithInsets.bottom);

            containingBounds.set(parentBounds.left, parentBoundsWithInsets.top, parentBounds.right,

                    bottom);

            containingBoundsWithInsets.set(parentBoundsWithInsets.left, parentBoundsWithInsets.top,
@@ -9047,8 +9047,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            // horizontally centered within parent bounds with insets, so position horizontal bounds

            // within parent bounds with insets to prevent insets from unnecessarily trimming

            // horizontal bounds.

            final int right = Math.min(parentBoundsWithInsets.left + parentBounds.height(),

                    parentBoundsWithInsets.right);

            final int right = Math.min(parentBoundsWithInsets.left

                            + parentBoundsWithInsets.height(), parentBoundsWithInsets.right);

            containingBounds.set(parentBoundsWithInsets.left, parentBounds.top, right,

                    parentBounds.bottom);

            containingBoundsWithInsets.set(parentBoundsWithInsets.left, parentBoundsWithInsets.top,

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.TestRule;
@@ -4075,6 +4076,7 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

    @Ignore // TODO(b/330888878): fix test in main

    public void testPortraitCloseToSquareDisplayWithTaskbar_notLetterboxed() {

        // Set up portrait close to square display

        setUpDisplaySizeWithApp(2200, 2280);