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

Commit 30f7116a authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Revert "EdgeExtension: Add a missing flag check" 

This reverts commit d15a6f8f.

Reason for revert: Unintentionally autosubmitted

Change-Id: I4d8ea9381ee2a5351ad41c571e0453f7b9ddc630
parent d15a6f8f

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

+1 −4
Original line number Diff line number Diff line
@@ -185,11 +185,8 @@ 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

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

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

                    }

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

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

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

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

                }