diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java index 06210ff98642..44ee5615ac74 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java @@ -331,7 +331,9 @@ class ActivityEmbeddingAnimationRunner { if (!animation.hasExtension()) { continue; } - if (adapter.mChange.hasFlags(FLAG_TRANSLUCENT)) { + if (adapter.mChange.hasFlags(FLAG_TRANSLUCENT) + && adapter.mChange.getActivityComponent() != null) { + // Skip edge extension for translucent activity. continue; } final TransitionInfo.Change change = adapter.mChange; |