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

Commit a7dad1fe authored by Marzia Favaro's avatar Marzia Favaro
Browse files

Edge extension effect: extend surfaces 

Instead of attaching new windows to extend the existing ones, we
enlarge the bounds and fill the surfaces with a shader

Bug: 322036393
Test: TransitionAnimationTests
Flag: com.android.graphics.libgui.flags.edge_extension_shader

Change-Id: I594088d5c605e267b3a02f53ed6e32b12074ab8d
parent 0be63b70

AconfigFlags.bp

+7 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ aconfig_declarations_group { 
        "framework_graphics_flags_java_lib",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "hwui_flags_java_lib",

        "libcore_exported_aconfig_flags_lib",

        "libcore_exported_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",

        "surfaceflinger_flags_java_lib",
@@ -1212,6 +1213,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}





java_aconfig_library {

    name: "libgui_flags_java_lib",

    aconfig_declarations: "libgui_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Content Capture

// Content Capture

aconfig_declarations {

aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",

    name: "android.view.contentcapture.flags-aconfig",

core/java/android/view/SurfaceControl.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,9 @@ public final class SurfaceControl implements Parcelable { 
            float width, float height, float vecX, float vecY,

            float width, float height, float vecX, float vecY,

            float maxStretchAmountX, float maxStretchAmountY, float childRelativeLeft,

            float maxStretchAmountX, float maxStretchAmountY, float childRelativeLeft,

            float childRelativeTop, float childRelativeRight, float childRelativeBottom);

            float childRelativeTop, float childRelativeRight, float childRelativeBottom);

    private static native void nativeSetEdgeExtensionEffect(long transactionObj, long nativeObj,

                                                            boolean leftEdge, boolean rightEdge,

                                                            boolean topEdge, boolean bottomEdge);

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

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

            int isTrustedOverlay);

            int isTrustedOverlay);

    private static native void nativeSetDropInputMode(

    private static native void nativeSetDropInputMode(
@@ -3510,6 +3513,19 @@ public final class SurfaceControl implements Parcelable { 
            return this;

            return this;

        }

        }





        /**

         * @hide

         */

        public Transaction setEdgeExtensionEffect(SurfaceControl sc, int edge) {

            checkPreconditions(sc);



            nativeSetEdgeExtensionEffect(

                    mNativeObject, sc.mNativeObject,

                    (edge & WindowInsets.Side.LEFT) != 0, (edge & WindowInsets.Side.RIGHT) != 0,

                    (edge & WindowInsets.Side.TOP) != 0, (edge & WindowInsets.Side.BOTTOM) != 0);

            return this;

        }



        /**

        /**

         * @hide

         * @hide

         */

         */
@@ -4882,4 +4898,5 @@ public final class SurfaceControl implements Parcelable { 
    public static void notifyShutdown() {

    public static void notifyShutdown() {

        nativeNotifyShutdown();

        nativeNotifyShutdown();

    }

    }



}
 
}

core/java/android/view/animation/Animation.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Handler; 
import android.os.SystemProperties;

import android.os.SystemProperties;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.util.TypedValue;

import android.view.WindowInsets;





import dalvik.system.CloseGuard;

import dalvik.system.CloseGuard;
@@ -881,12 +882,13 @@ public abstract class Animation implements Cloneable { 
    }

    }





    /**

    /**

     * @return if a window animation has outsets applied to it.

     * @return the edges to which outsets can be applied to

     *

     *

     * @hide

     * @hide

     */

     */

    public boolean hasExtension() {

    @WindowInsets.Side.InsetsSide

        return false;

    public int getExtensionEdges() {

        return 0x0;

    }

    }





    /**

    /**

core/java/android/view/animation/AnimationSet.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.res.TypedArray; 
import android.graphics.RectF;

import android.graphics.RectF;

import android.os.Build;

import android.os.Build;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.WindowInsets;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;
@@ -540,12 +541,12 @@ public class AnimationSet extends Animation { 




    /** @hide */

    /** @hide */

    @Override

    @Override

    public boolean hasExtension() {

    @WindowInsets.Side.InsetsSide

    public int getExtensionEdges() {

        int edge = 0x0;

        for (Animation animation : mAnimations) {

        for (Animation animation : mAnimations) {

            if (animation.hasExtension()) {

            edge |= animation.getExtensionEdges();

                return true;

        }

        }

        }

        return edge;

        return false;

    }

    }

}
 
}

core/java/android/view/animation/ExtendAnimation.java

+19 −3
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.Insets;

import android.graphics.Insets;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.WindowInsets;





/**

/**

 * An animation that controls the outset of an object.

 * An animation that controls the outset of an object.
@@ -50,6 +51,8 @@ public class ExtendAnimation extends Animation { 
    private float mToRightValue;

    private float mToRightValue;

    private float mToBottomValue;

    private float mToBottomValue;





    private int mExtensionEdges = 0x0;



    /**

    /**

     * Constructor used when an ExtendAnimation is loaded from a resource.

     * Constructor used when an ExtendAnimation is loaded from a resource.

     *

     *
@@ -151,9 +154,22 @@ public class ExtendAnimation extends Animation { 




    /** @hide */

    /** @hide */

    @Override

    @Override

    public boolean hasExtension() {

    @WindowInsets.Side.InsetsSide

        return mFromInsets.left < 0 || mFromInsets.top < 0 || mFromInsets.right < 0

    public int getExtensionEdges() {

                || mFromInsets.bottom < 0;

        mExtensionEdges = 0x0;

        if (mFromLeftValue > 0 || mToLeftValue > 0) {

            mExtensionEdges |= WindowInsets.Side.LEFT;

        }

        if (mFromRightValue > 0 || mToRightValue > 0) {

            mExtensionEdges |= WindowInsets.Side.RIGHT;

        }

        if (mFromTopValue > 0 || mToTopValue > 0) {

            mExtensionEdges |= WindowInsets.Side.TOP;

        }

        if (mFromBottomValue > 0 || mToBottomValue > 0) {

            mExtensionEdges |= WindowInsets.Side.BOTTOM;

        }

        return mExtensionEdges;

    }

    }





    @Override

    @Override