diff options
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java index 86e0f14c5c71..2922b07e0e1b 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationAdapter.java @@ -185,7 +185,10 @@ class ActivityEmbeddingAnimationAdapter { @CallSuper void onAnimationEnd(@NonNull SurfaceControl.Transaction t) { onAnimationUpdate(t, mAnimation.getDuration()); - t.setEdgeExtensionEffect(mLeash, /* edge */ 0); + if (com.android.graphics.libgui.flags.Flags.edgeExtensionShader() + && mAnimation.getExtensionEdges() != 0) { + t.setEdgeExtensionEffect(mLeash, /* edge */ 0); + } } final long getDurationHint() { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index d8c8c605184c..472018776df6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -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); } |