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

Commit 6656eb4c authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SurfaceControl: Add missing constant values to... 

Merge "SurfaceControl: Add missing constant values to @android.view.SurfaceControl.BufferTransform" into main
parents 140a7bdf 76c16e3e

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -53748,7 +53748,9 @@ package android.view { 
    method public void writeToParcel(android.os.Parcel, int);

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

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

    field @FlaggedApi("com.android.graphics.hwui.flags.add_surfacecontrol_constants") public static final int BUFFER_TRANSFORM_MIRROR_HORIZONTAL_ROTATE_90 = 5; // 0x5

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

    field @FlaggedApi("com.android.graphics.hwui.flags.add_surfacecontrol_constants") public static final int BUFFER_TRANSFORM_MIRROR_VERTICAL_ROTATE_90 = 6; // 0x6

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

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

    field public static final int BUFFER_TRANSFORM_ROTATE_90 = 4; // 0x4

core/java/android/view/SurfaceControl.java

+16 −2
Original line number Diff line number Diff line
@@ -348,8 +348,8 @@ public final class SurfaceControl implements Parcelable { 
            value = {BUFFER_TRANSFORM_IDENTITY, BUFFER_TRANSFORM_MIRROR_HORIZONTAL,

                    BUFFER_TRANSFORM_MIRROR_VERTICAL, BUFFER_TRANSFORM_ROTATE_90,

                    BUFFER_TRANSFORM_ROTATE_180, BUFFER_TRANSFORM_ROTATE_270,

                    BUFFER_TRANSFORM_MIRROR_HORIZONTAL | BUFFER_TRANSFORM_ROTATE_90,

                    BUFFER_TRANSFORM_MIRROR_VERTICAL | BUFFER_TRANSFORM_ROTATE_90})

                    BUFFER_TRANSFORM_MIRROR_HORIZONTAL_ROTATE_90,

                    BUFFER_TRANSFORM_MIRROR_VERTICAL_ROTATE_90})

    public @interface BufferTransform {

    }
@@ -390,6 +390,20 @@ public final class SurfaceControl implements Parcelable { 
     * Equivalent to ({@link #BUFFER_TRANSFORM_ROTATE_180} | {@link #BUFFER_TRANSFORM_ROTATE_90}).

     */

    public static final int BUFFER_TRANSFORM_ROTATE_270 = 0x07;

    /**

     * Mirror horizontally and rotate 90 degrees clock-wise.

     * Equivalent to ({@link #BUFFER_TRANSFORM_MIRROR_HORIZONTAL} |

     *                {@link #BUFFER_TRANSFORM_ROTATE_90}).

     */

    @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_ADD_SURFACECONTROL_CONSTANTS)

    public static final int BUFFER_TRANSFORM_MIRROR_HORIZONTAL_ROTATE_90 = 0x05;

    /**

     * Mirror vertically and rotate 90 degrees clock-wise.

     * Equivalent to ({@link #BUFFER_TRANSFORM_MIRROR_VERTICAL} |

     *                {@link #BUFFER_TRANSFORM_ROTATE_90}).

     */

    @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_ADD_SURFACECONTROL_CONSTANTS)

    public static final int BUFFER_TRANSFORM_MIRROR_VERTICAL_ROTATE_90 = 0x06;



    /**

     * @hide

libs/hwui/aconfig/hwui_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -202,3 +202,10 @@ flag { 
  bug: "400807118"

  is_fixed_read_only: true

}



flag {

  name: "add_surfacecontrol_constants"

  namespace: "core_graphics"

  description: "Add two helper constants to SurfaceControl to improve @IntDef lint"

  bug: "413710706"

}
 
 No newline at end of file