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

Commit 6c5b19e1 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fixed RoundedCorner bugs" into sc-dev am: 26321768 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabf926831fd22043e5e4ed693c3606cad27f49e8
parents d0cd154e 26321768

core/java/android/view/RoundedCorner.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public final class RoundedCorner implements Parcelable { 
     * @hide

     */

    public boolean isEmpty() {

        return mRadius == 0 || mCenter.x == 0 || mCenter.y == 0;

        return mRadius == 0 || mCenter.x <= 0 || mCenter.y <= 0;

    }



    private String getPositionString(@Position int position) {

core/java/android/view/RoundedCorners.java

+4 −4
Original line number Diff line number Diff line
@@ -181,16 +181,16 @@ public class RoundedCorners implements Parcelable { 
        boolean hasRoundedCorner;

        switch (position) {

            case POSITION_TOP_LEFT:

                hasRoundedCorner = radius > insetTop || radius > insetLeft;

                hasRoundedCorner = radius > insetTop && radius > insetLeft;

                break;

            case POSITION_TOP_RIGHT:

                hasRoundedCorner = radius > insetTop || radius > insetRight;

                hasRoundedCorner = radius > insetTop && radius > insetRight;

                break;

            case POSITION_BOTTOM_RIGHT:

                hasRoundedCorner = radius > insetBottom || radius > insetRight;

                hasRoundedCorner = radius > insetBottom && radius > insetRight;

                break;

            case POSITION_BOTTOM_LEFT:

                hasRoundedCorner = radius > insetBottom || radius > insetLeft;

                hasRoundedCorner = radius > insetBottom && radius > insetLeft;

                break;

            default:

                throw new IllegalArgumentException(

core/tests/coretests/src/android/view/RoundedCornerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,13 @@ public class RoundedCornerTest { 
        assertThat(roundedCorner.isEmpty(), is(true));

    }



    @Test

    public void testIsEmpty_negativeCenter() {

        RoundedCorner roundedCorner =

                new RoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT, 1, -2, -3);

        assertThat(roundedCorner.isEmpty(), is(true));

    }



    @Test

    public void testEquals() {

        RoundedCorner roundedCorner = new RoundedCorner(

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

+2 −0
Original line number Diff line number Diff line
@@ -1862,6 +1862,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // Update application display metrics.

        final WmDisplayCutout wmDisplayCutout = calculateDisplayCutoutForRotation(rotation);

        final DisplayCutout displayCutout = wmDisplayCutout.getDisplayCutout();

        final RoundedCorners roundedCorners = calculateRoundedCornersForRotation(rotation);



        final int appWidth = mDisplayPolicy.getNonDecorDisplayWidth(dw, dh, rotation, uiMode,

                displayCutout);
@@ -1878,6 +1879,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                    CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null);

        }

        mDisplayInfo.displayCutout = displayCutout.isEmpty() ? null : displayCutout;

        mDisplayInfo.roundedCorners = roundedCorners;

        mDisplayInfo.getAppMetrics(mDisplayMetrics);

        if (mDisplayScalingDisabled) {

            mDisplayInfo.flags |= Display.FLAG_SCALING_DISABLED;