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

Commit 7f754b2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "surface_control: Add ABI type information to `enum`s" into main am:... 

Merge "surface_control: Add ABI type information to `enum`s" into main am: 72e720a9 am: 20fc03cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3023923



Change-Id: Iacc77094671afe332c131cf472c269b3ddd6a6c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f81ef3c8 20fc03cd

include/android/surface_control.h

+5 −4
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ void ASurfaceTransaction_reparent(ASurfaceTransaction* transaction, 
/**

 * Parameter for ASurfaceTransaction_setVisibility().

 */

enum {

enum ASurfaceTransactionVisibility : int8_t {

    ASURFACE_TRANSACTION_VISIBILITY_HIDE = 0,

    ASURFACE_TRANSACTION_VISIBILITY_SHOW = 1,

};
@@ -319,7 +319,8 @@ enum { 
 * Available since API level 29.

 */

void ASurfaceTransaction_setVisibility(ASurfaceTransaction* transaction,

                                       ASurfaceControl* surface_control, int8_t visibility)

                                       ASurfaceControl* surface_control,

                                       enum ASurfaceTransactionVisibility visibility)

                                       __INTRODUCED_IN(29);



/**
@@ -440,7 +441,7 @@ void ASurfaceTransaction_setScale(ASurfaceTransaction* transaction, 
/**

 * Parameter for ASurfaceTransaction_setBufferTransparency().

 */

enum {

enum ASurfaceTransactionTransparency : int8_t {

    ASURFACE_TRANSACTION_TRANSPARENCY_TRANSPARENT = 0,

    ASURFACE_TRANSACTION_TRANSPARENCY_TRANSLUCENT = 1,

    ASURFACE_TRANSACTION_TRANSPARENCY_OPAQUE = 2,
@@ -454,7 +455,7 @@ enum { 
 */

void ASurfaceTransaction_setBufferTransparency(ASurfaceTransaction* transaction,

                                               ASurfaceControl* surface_control,

                                               int8_t transparency)

                                               enum ASurfaceTransactionTransparency transparency)

                                               __INTRODUCED_IN(29);



/**