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

Commit 3b8b6545 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Remove @hide from Matrix 

Bug: 152983829
Test: make
Test: I77ec845b5503df6f90deb6a2176836d9aacb74d1

Make IDENTITY_MATRIX a public API. It had @UnsupportedAppUsage, and it
is a useful thing to have.

Replace printShortString with dump, to match Point#dump (added in
I5e25dbbe47b3c690d7d763a0082beb8d8a9c86d3) and others. Make this public
as well.

Remove @UnsupportedAppUsage from native_instance, which appears to be a
false positive (no usage found on the dashboard). Also make it private,
forcing other classes to call ni().

Document why ni() needs to be @hide (usage by classes outside the
package but inside the module). Also add a FIXME that PdfRenderer should
*not* be calling it, since we plan for it to be outside the module.

Make toShortString(StringBuilder) private. Switch its only external
client to the public version. (While I see a few public
"toShortString()" methods in the public API, I do not see any that take
a StringBuilder parameter.)

Fix a typo.

Change-Id: I356fb6729764f1777830fc3a91216e869bf6de16
parent 3e53fece

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -14818,6 +14818,7 @@ package android.graphics { 
  public class Matrix {

    ctor public Matrix();

    ctor public Matrix(android.graphics.Matrix);

    method public final void dump(@NonNull java.io.PrintWriter);

    method public void getValues(float[]);

    method public boolean invert(android.graphics.Matrix);

    method public boolean isAffine();
@@ -14864,6 +14865,7 @@ package android.graphics { 
    method public void setTranslate(float, float);

    method public void setValues(float[]);

    method public String toShortString();

    field @NonNull public static final android.graphics.Matrix IDENTITY_MATRIX;

    field public static final int MPERSP_0 = 6; // 0x6

    field public static final int MPERSP_1 = 7; // 0x7

    field public static final int MPERSP_2 = 8; // 0x8

core/java/android/view/TextureLayer.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public final class TextureLayer { 
     * @param matrix The transform to apply to the layer.

     */

    public void setTransform(Matrix matrix) {

        nSetTransform(mFinalizer.get(), matrix.native_instance);

        nSetTransform(mFinalizer.get(), matrix.ni());

        mRenderer.pushLayerUpdate(this);

    }

core/java/android/view/animation/Transformation.java

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class Transformation { 
     */

    public void toShortString(StringBuilder sb) {

        sb.append("{alpha="); sb.append(mAlpha);

        sb.append(" matrix="); mMatrix.toShortString(sb);

        sb.append(" matrix="); sb.append(mMatrix.toShortString());

        sb.append('}');

    }
@@ -243,7 +243,7 @@ public class Transformation { 
    public void printShortString(PrintWriter pw) {

        pw.print("{alpha="); pw.print(mAlpha);

        pw.print(" matrix=");

        mMatrix.printShortString(pw);

        mMatrix.dump(pw);

        pw.print('}');

    }

}

graphics/java/android/graphics/Camera.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class Camera { 
     * @param matrix The matrix to copy the current transforms into

     */

    public void getMatrix(Matrix matrix) {

        nativeGetMatrix(matrix.native_instance);

        nativeGetMatrix(matrix.ni());

    }



    /**

graphics/java/android/graphics/Canvas.java

+3 −3
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ public class Canvas extends BaseCanvas { 
     * @param matrix The matrix to preconcatenate with the current matrix

     */

    public void concat(@Nullable Matrix matrix) {

        if (matrix != null) nConcat(mNativeCanvasWrapper, matrix.native_instance);

        if (matrix != null) nConcat(mNativeCanvasWrapper, matrix.ni());

    }



    /**
@@ -777,7 +777,7 @@ public class Canvas extends BaseCanvas { 
     */

    public void setMatrix(@Nullable Matrix matrix) {

        nSetMatrix(mNativeCanvasWrapper,

                         matrix == null ? 0 : matrix.native_instance);

                         matrix == null ? 0 : matrix.ni());

    }



    /**
@@ -792,7 +792,7 @@ public class Canvas extends BaseCanvas { 
     */

    @Deprecated

    public void getMatrix(@NonNull Matrix ctm) {

        nGetMatrix(mNativeCanvasWrapper, ctm.native_instance);

        nGetMatrix(mNativeCanvasWrapper, ctm.ni());

    }



    /**