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

Commit 98a36e13 authored by Jorge Betancourt's avatar Jorge Betancourt
Browse files

replace concat44 with overloaded signature 

Test: atest CtsUiRenderingTestCases:android.uirendering.cts.testclasses.CanvasTests#testDrawWithConcatenatedMatrix44
Bug:326418986

Change-Id: I06c20bdad9d1a18de90f24ae8d9065a72bd06b82
parent 3da1c926

core/api/current.txt

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

    }



    /**