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

Commit ff9d6ab6 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Expose rounded corners to SurfaceControl 

Bug: 111514493
Test: Manualy launch an app
Test: Press home when activity is on top of the stack
Test: Quick scrub
Test: Swipe up on the home button, swipe down
Change-Id: Id8196e344585b4f7aebea595c12e7276dbbd881b
parent 086c6fc0

core/java/android/view/SurfaceControl.java

+28 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ public class SurfaceControl implements Parcelable { 
            int flags, int mask);

    private static native void nativeSetWindowCrop(long transactionObj, long nativeObject,

            int l, int t, int r, int b);

    private static native void nativeSetCornerRadius(long transactionObj, long nativeObject,

            float cornerRadius);

    private static native void nativeSetLayerStack(long transactionObj, long nativeObject,

            int layerStack);
@@ -1006,6 +1008,18 @@ public class SurfaceControl implements Parcelable { 
        }

    }



    /**

     * Sets the corner radius of a {@link SurfaceControl}.

     *

     * @param cornerRadius Corner radius in pixels.

     */

    public void setCornerRadius(float cornerRadius) {

        checkNotReleased();

        synchronized (SurfaceControl.class) {

            sGlobalTransaction.setCornerRadius(this, cornerRadius);

        }

    }



    public void setLayerStack(int layerStack) {

        checkNotReleased();

        synchronized(SurfaceControl.class) {
@@ -1529,6 +1543,20 @@ public class SurfaceControl implements Parcelable { 
            return this;

        }



        /**

         * Sets the corner radius of a {@link SurfaceControl}.

         * @param sc SurfaceControl

         * @param cornerRadius Corner radius in pixels.

         * @return Itself.

         */

        @UnsupportedAppUsage

        public Transaction setCornerRadius(SurfaceControl sc, float cornerRadius) {

            sc.checkNotReleased();

            nativeSetCornerRadius(mNativeObject, sc.mNativeObject, cornerRadius);



            return this;

        }



        @UnsupportedAppUsage

        public Transaction setLayerStack(SurfaceControl sc, int layerStack) {

            sc.checkNotReleased();

core/jni/android_view_SurfaceControl.cpp

+10 −0
Original line number Diff line number Diff line
@@ -377,6 +377,14 @@ static void nativeSetWindowCrop(JNIEnv* env, jclass clazz, jlong transactionObj, 
    transaction->setCrop_legacy(ctrl, crop);

}



static void nativeSetCornerRadius(JNIEnv* env, jclass clazz, jlong transactionObj,

         jlong nativeObject, jfloat cornerRadius) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



    SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);

    transaction->setCornerRadius(ctrl, cornerRadius);

}



static void nativeSetLayerStack(JNIEnv* env, jclass clazz, jlong transactionObj,

        jlong nativeObject, jint layerStack) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
@@ -883,6 +891,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeSetFlags },

    {"nativeSetWindowCrop", "(JJIIII)V",

            (void*)nativeSetWindowCrop },

    {"nativeSetCornerRadius", "(JJF)V",

            (void*)nativeSetCornerRadius },

    {"nativeSetLayerStack", "(JJI)V",

            (void*)nativeSetLayerStack },

    {"nativeGetBuiltInDisplay", "(I)Landroid/os/IBinder;",