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

Commit 55576285 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Follow up to Iff58235b5bdfd0d49df259a91b05e54e3864f41c"

parents 3fb240d4 bed538ed

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1211,7 +1211,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;