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

Commit e98ae477 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Deprecate Path#isConvex"

parents 715a1c65 6a0cdd24

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15082,7 +15082,7 @@ package android.graphics { 
    method public void cubicTo(float, float, float, float, float, float);

    method @NonNull public android.graphics.Path.FillType getFillType();

    method public void incReserve(int);

    method public boolean isConvex();

    method @Deprecated public boolean isConvex();

    method public boolean isEmpty();

    method public boolean isInverseFillType();

    method public boolean isRect(@Nullable android.graphics.RectF);

core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java

+0 −6
Original line number Diff line number Diff line
@@ -145,9 +145,6 @@ public class AdaptiveIconDrawableTest extends AndroidTestCase { 
        assertEquals("top", boundFromDrawable.top, boundFromDeviceConfig.top, delta);

        assertEquals("right", boundFromDrawable.right, boundFromDeviceConfig.right, delta);

        assertEquals("bottom", boundFromDrawable.bottom, boundFromDeviceConfig.bottom, delta);



        assertTrue("path from device config is convex.", pathFromDeviceConfig.isConvex());

        assertTrue("path from drawable is convex.", pathFromDrawable.isConvex());

    }



    @Test
@@ -169,8 +166,6 @@ public class AdaptiveIconDrawableTest extends AndroidTestCase { 
        assertEquals("top", top, maskBounds.top, delta);

        assertEquals("right", right, maskBounds.right, delta);

        assertEquals("bottom", bottom, maskBounds.bottom, delta);



        assertTrue(mIconDrawable.getIconMask().isConvex());

    }



    @Test
@@ -185,7 +180,6 @@ public class AdaptiveIconDrawableTest extends AndroidTestCase { 
        mIconDrawable.setBounds(left, top, right, bottom);

        Outline outline = new Outline();

        mIconDrawable.getOutline(outline);

        assertTrue("outline path should be convex", outline.mPath.isConvex());

    }



    @Test

graphics/java/android/graphics/Path.java

+6 −0
Original line number Diff line number Diff line
@@ -209,7 +209,13 @@ public class Path { 
     * points, and cache the result.

     *

     * @return True if the path is convex.

     *

     * @deprecated This method is not reliable. The way convexity is computed may change from

     * release to release, and convexity could change based on a matrix as well. This method was

     * useful when non-convex Paths were unable to be used in certain contexts, but that is no

     * longer the case.

     */

    @Deprecated

    public boolean isConvex() {

        return nIsConvex(mNativePath);

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableOutlineView.java

+1 −3
Original line number Diff line number Diff line
@@ -92,9 +92,7 @@ public abstract class ExpandableOutlineView extends ExpandableView { 
                outline.setRect(left, top, right, bottom);

            } else {

                Path clipPath = getClipPath(false /* ignoreTranslation */);

                if (clipPath != null && clipPath.isConvex()) {

                    // The path might not be convex in border cases where the view is small and

                    // clipped

                if (clipPath != null) {

                    outline.setConvexPath(clipPath);

                }

            }