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

Commit 90735dc0 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Cleanup Canvas API by deprecating a few methods."

parents 00f53584 0d181540

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10174,8 +10174,8 @@ package android.graphics { 
    method public boolean clipRect(float, float, float, float, android.graphics.Region.Op);

    method public boolean clipRect(float, float, float, float);

    method public boolean clipRect(int, int, int, int);

    method public boolean clipRegion(android.graphics.Region, android.graphics.Region.Op);

    method public boolean clipRegion(android.graphics.Region);

    method public deprecated boolean clipRegion(android.graphics.Region, android.graphics.Region.Op);

    method public deprecated boolean clipRegion(android.graphics.Region);

    method public void concat(android.graphics.Matrix);

    method public void drawARGB(int, int, int, int);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

graphics/java/android/graphics/Canvas.java

+6 −0
Original line number Diff line number Diff line
@@ -713,6 +713,9 @@ public class Canvas { 
     * @param region The region to operate on the current clip, based on op

     * @param op How the clip is modified

     * @return true if the resulting is non-empty

     *

     * @deprecated Unlike all other clip calls this API does not respect the

     *             current matrix. Use {@link #clipRect(Rect)} as an alternative.

     */

    public boolean clipRegion(Region region, Region.Op op) {

        return native_clipRegion(mNativeCanvas, region.ni(), op.nativeInt);
@@ -727,6 +730,9 @@ public class Canvas { 
     *

     * @param region The region to operate on the current clip, based on op

     * @return true if the resulting is non-empty

     *

     * @deprecated Unlike all other clip calls this API does not respect the

     *             current matrix. Use {@link #clipRect(Rect)} as an alternative.

     */

    public boolean clipRegion(Region region) {

        return clipRegion(region, Region.Op.INTERSECT);