diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java index bfbddbbe4aa00..58e7b8d473407 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingController.java @@ -16,6 +16,7 @@ package com.android.wm.shell.activityembedding; +import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION; import static android.window.TransitionInfo.FLAG_FILLS_TASK; import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY; @@ -111,6 +112,11 @@ public class ActivityEmbeddingController implements Transitions.TransitionHandle if (containsNonEmbeddedChange && !handleNonEmbeddedChanges(changes)) { return false; } + final TransitionInfo.AnimationOptions options = info.getAnimationOptions(); + if (options != null && options.getType() == ANIM_SCENE_TRANSITION) { + // Scene-transition will be handled by app side. + return false; + } // Start ActivityEmbedding animation. mTransitionCallbacks.put(transition, finishCallback);