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

Commit bed538ed authored by Adrian Roos's avatar Adrian Roos
Browse files

Follow up to Iff58235b5bdfd0d49df259a91b05e54e3864f41c 

Test: atest PhoneWindowManagerInsetsTest
Change-Id: I586d52c025ebab4146e6f03b76e6712fd97af7bf
parent 78cab5a5

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1205,7 +1205,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        if (rotation == ROTATION_0) {

        if (rotation == ROTATION_0) {

            return cutout.computeSafeInsets(mInitialDisplayWidth, mInitialDisplayHeight);

            return cutout.computeSafeInsets(mInitialDisplayWidth, mInitialDisplayHeight);

        }

        }

        final boolean rotated = (rotation == ROTATION_90 || mRotation == ROTATION_270);

        final boolean rotated = (rotation == ROTATION_90 || rotation == ROTATION_270);

        final Path bounds = cutout.getBounds().getBoundaryPath();

        final Path bounds = cutout.getBounds().getBoundaryPath();

        transformPhysicalToLogicalCoordinates(rotation, mInitialDisplayWidth, mInitialDisplayHeight,

        transformPhysicalToLogicalCoordinates(rotation, mInitialDisplayWidth, mInitialDisplayHeight,

                mTmpMatrix);

                mTmpMatrix);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ public class DockedStackDividerController { 
            final int appWidth = mService.mPolicy.getNonDecorDisplayWidth(dw, dh, rotation,

            final int appWidth = mService.mPolicy.getNonDecorDisplayWidth(dw, dh, rotation,

                baseConfig.uiMode, displayId, displayCutout);

                baseConfig.uiMode, displayId, displayCutout);

            final int appHeight = mService.mPolicy.getNonDecorDisplayHeight(dw, dh, rotation,

            final int appHeight = mService.mPolicy.getNonDecorDisplayHeight(dw, dh, rotation,

                baseConfig.uiMode, displayId, mDisplayContent.getDisplayInfo().displayCutout);

                baseConfig.uiMode, displayId, displayCutout);

            mService.mPolicy.getNonDecorInsetsLw(rotation, dw, dh, displayCutout, mTmpRect);

            mService.mPolicy.getNonDecorInsetsLw(rotation, dw, dh, displayCutout, mTmpRect);

            final int leftInset = mTmpRect.left;

            final int leftInset = mTmpRect.left;

            final int topInset = mTmpRect.top;

            final int topInset = mTmpRect.top;