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

Commit 7c60189a authored by Vasiliy Telezhnikov's avatar Vasiliy Telezhnikov Committed by Automerger Merge Worker
Browse files

Merge "Split ASurfaceTransaction_setGeometry api" into sc-dev am: 647da08b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13865086

Change-Id: I4d5daa68826fdd578e2c991313894c0feb10c5cd
parents 5cb9e23f 647da08b

native/android/libandroid.map.txt

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ LIBANDROID { 
    ASurfaceTransaction_setHdrMetadata_cta861_3; # introduced=29

    ASurfaceTransaction_setHdrMetadata_smpte2086; # introduced=29

    ASurfaceTransaction_setOnComplete; # introduced=29

    ASurfaceTransaction_setPosition; # introduced=31

    ASurfaceTransaction_setSourceRect; # introduced=31

    ASurfaceTransaction_setTransform; # introduced=31

    ASurfaceTransaction_setVisibility; # introduced=29

    ASurfaceTransaction_setZOrder; # introduced=29

    ASystemFontIterator_open; # introduced=29

native/android/surface_control.cpp

+38 −0
Original line number Diff line number Diff line
@@ -446,6 +446,44 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction, 
    transaction->setTransformToDisplayInverse(surfaceControl, transformToInverseDisplay);

}



void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction,

                                       ASurfaceControl* aSurfaceControl, const ARect& source) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);

    CHECK_VALID_RECT(source);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setCrop(surfaceControl, static_cast<const Rect&>(source));

}



void ASurfaceTransaction_setPosition(ASurfaceTransaction* aSurfaceTransaction,

                                     ASurfaceControl* aSurfaceControl, const ARect& destination) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);

    CHECK_VALID_RECT(destination);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));

}



void ASurfaceTransaction_setTransform(ASurfaceTransaction* aSurfaceTransaction,

                                      ASurfaceControl* aSurfaceControl, int32_t transform) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setTransform(surfaceControl, transform);

    bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) ==

            NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;

    transaction->setTransformToDisplayInverse(surfaceControl, transformToInverseDisplay);

}



void ASurfaceTransaction_setBufferTransparency(ASurfaceTransaction* aSurfaceTransaction,

                                               ASurfaceControl* aSurfaceControl,

                                               int8_t transparency) {