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

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

Merge "replace concat44 with overloaded signature" into main

parents 9405f9f8 98a36e13

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15708,7 +15708,7 @@ package android.graphics { 
    method public boolean clipRect(int, int, int, int);

    method @FlaggedApi("com.android.graphics.hwui.flags.clip_shader") public void clipShader(@NonNull android.graphics.Shader);

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

    method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void concat44(@Nullable android.graphics.Matrix44);

    method @FlaggedApi("com.android.graphics.hwui.flags.matrix_44") public void concat(@Nullable android.graphics.Matrix44);

    method public void disableZ();

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

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

graphics/java/android/graphics/Canvas.java

+2 −4
Original line number Diff line number Diff line
@@ -789,10 +789,8 @@ public class Canvas extends BaseCanvas { 
     * @param m The 4x4 matrix to preconcatenate with the current matrix

     */

    @FlaggedApi(Flags.FLAG_MATRIX_44)

    public void concat44(@Nullable Matrix44 m) {

        if (m != null) {

            nConcat(mNativeCanvasWrapper, m.mBackingArray);

        }

    public void concat(@Nullable Matrix44 m) {

        if (m != null) nConcat(mNativeCanvasWrapper, m.mBackingArray);

    }



    /**