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

Commit 6ea4dd9a authored by Graciela Putri's avatar Graciela Putri Committed by Automerger Merge Worker
Browse files

Merge "Restrict app to boundsWithInsets to respect orientation" into 24D1-dev am: 21b1e335 

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



Change-Id: I4267beef5225932f7125f0a1325f38fa9e1e53c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c02d63da 21b1e335

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

+4 −4
Original line number Diff line number Diff line
@@ -9062,8 +9062,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,
@@ -9074,8 +9074,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
@@ -130,6 +130,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;
@@ -4203,6 +4204,7 @@ public class SizeCompatTests extends WindowTestsBase { 
    }



    @Test

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

    public void testPortraitCloseToSquareDisplayWithTaskbar_notLetterboxed() {

        if (Flags.insetsDecoupledConfiguration()) {

            // TODO (b/151861875): Re-enable it. This is disabled temporarily because the config