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

Commit 5b8c49ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "EdgeExtension: Add a missing flag check" into main

parents 23fbeec4 d15a6f8f

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java

+4 −1
Original line number Diff line number Diff line
@@ -185,8 +185,11 @@ class ActivityEmbeddingAnimationAdapter { 
    @CallSuper

    void onAnimationEnd(@NonNull SurfaceControl.Transaction t) {

        onAnimationUpdate(t, mAnimation.getDuration());

        if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()

                && mAnimation.getExtensionEdges() != 0) {

            t.setEdgeExtensionEffect(mLeash, /* edge */ 0);

        }

    }



    final long getDurationHint() {

        return mAnimation.computeDurationHint();

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                        postStartTransactionCallbacks

                                .add(t -> edgeExtendWindow(change, a, t, finishTransaction));

                    }

                } else if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()) {

                } else if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader()

                        && a.getExtensionEdges() != 0) {

                    finishTransaction.setEdgeExtensionEffect(change.getLeash(), /* edge */ 0);

                }