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

Commit 972bbd99 authored by Garfield Tan's avatar Garfield Tan
Browse files

Remove insets before calculating bounds 

Bug: 152366979
Test: atest ActivityRecordTests#ignoreRequestedOrientationInFreeformWindows
      on landscape device with bottom inset
Test: atest ActivityRecordTests#ignoreRequestedOrientationInSplitWindows
      on landscape device with bottom inset
Change-Id: Ia5dc2260b688fead9f136574dcbaf093eb12c9db
parent f903ef10

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

+22 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ import android.os.PersistableBundle; 
import android.platform.test.annotations.Presubmit;

import android.util.MergedConfiguration;

import android.util.MutableBoolean;

import android.view.DisplayInfo;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.IRemoteAnimationRunner.Stub;

import android.view.RemoteAnimationAdapter;
@@ -399,6 +400,16 @@ public class ActivityRecordTests extends ActivityTestsBase { 
        mStack.setWindowingMode(WindowConfiguration.WINDOWING_MODE_FREEFORM);

        final Rect stableRect = new Rect();

        mStack.getDisplay().mDisplayContent.getStableRect(stableRect);



        // Carve out non-decor insets from stableRect

        final Rect insets = new Rect();

        final DisplayInfo displayInfo = mStack.getDisplay().getDisplayInfo();

        final DisplayPolicy policy = mStack.getDisplay().getDisplayPolicy();

        policy.getNonDecorInsetsLw(displayInfo.rotation, displayInfo.logicalWidth,

                displayInfo.logicalHeight, displayInfo.displayCutout, insets);

        policy.convertNonDecorInsetsToStableInsets(insets, displayInfo.rotation);

        Task.intersectWithInsetsIfFits(stableRect, stableRect, insets);



        final boolean isScreenPortrait = stableRect.width() <= stableRect.height();

        final Rect bounds = new Rect(stableRect);

        if (isScreenPortrait) {
@@ -427,7 +438,17 @@ public class ActivityRecordTests extends ActivityTestsBase { 
    public void ignoreRequestedOrientationInSplitWindows() {

        mStack.setWindowingMode(WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        final Rect stableRect = new Rect();

        mStack.getDisplay().mDisplayContent.getStableRect(stableRect);

        mStack.getDisplay().getStableRect(stableRect);



        // Carve out non-decor insets from stableRect

        final Rect insets = new Rect();

        final DisplayInfo displayInfo = mStack.getDisplay().getDisplayInfo();

        final DisplayPolicy policy = mStack.getDisplay().getDisplayPolicy();

        policy.getNonDecorInsetsLw(displayInfo.rotation, displayInfo.logicalWidth,

                displayInfo.logicalHeight, displayInfo.displayCutout, insets);

        policy.convertNonDecorInsetsToStableInsets(insets, displayInfo.rotation);

        Task.intersectWithInsetsIfFits(stableRect, stableRect, insets);



        final boolean isScreenPortrait = stableRect.width() <= stableRect.height();

        final Rect bounds = new Rect(stableRect);

        if (isScreenPortrait) {