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

Commit a4cda4d6 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Make constants final"

parents 2be7ec67 fadd2081

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -27972,10 +27972,10 @@ package android.view.animation { 
    method public void setAlpha(float);

    method public void setTransformationType(int);

    method public java.lang.String toShortString();

    field public static int TYPE_ALPHA;

    field public static int TYPE_BOTH;

    field public static int TYPE_IDENTITY;

    field public static int TYPE_MATRIX;

    field public static final int TYPE_ALPHA = 1; // 0x1

    field public static final int TYPE_BOTH = 3; // 0x3

    field public static final int TYPE_IDENTITY = 0; // 0x0

    field public static final int TYPE_MATRIX = 2; // 0x2

    field protected float mAlpha;

    field protected android.graphics.Matrix mMatrix;

    field protected int mTransformationType;

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

+4 −4
Original line number Diff line number Diff line
@@ -29,19 +29,19 @@ public class Transformation { 
    /**

     * Indicates a transformation that has no effect (alpha = 1 and identity matrix.)

     */

    public static int TYPE_IDENTITY = 0x0;

    public static final int TYPE_IDENTITY = 0x0;

    /**

     * Indicates a transformation that applies an alpha only (uses an identity matrix.)

     */

    public static int TYPE_ALPHA = 0x1;

    public static final int TYPE_ALPHA = 0x1;

    /**

     * Indicates a transformation that applies a matrix only (alpha = 1.)

     */

    public static int TYPE_MATRIX = 0x2;

    public static final int TYPE_MATRIX = 0x2;

    /**

     * Indicates a transformation that applies an alpha and a matrix.

     */

    public static int TYPE_BOTH = TYPE_ALPHA | TYPE_MATRIX;

    public static final int TYPE_BOTH = TYPE_ALPHA | TYPE_MATRIX;



    protected Matrix mMatrix;

    protected float mAlpha;