summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2024-01-10 07:17:57 +0000
committer Louis Chang <louischang@google.com> 2024-01-10 07:17:57 +0000
commitb2cfbc4a8e6a8c70d24b08e95d5a596c154f164a (patch)
tree679add616cfc82fc09e0f6f17e7a5cce64a202ad
parente799141c5775987f368d0664e760a26065e5d9c6 (diff)
Fixes no edge extension in Settings
This is a regression by commit 7584735. Clicking on the list items on the primary TF on Settings will start a new and adjacent secondary TF. In that case, the original secondary TF no longer has an adjacent TF and therefore is evaluated as a translucent change. Skip adding edge extension for translucent Activity only. Bug: 319169778 Test: verify on Settings Change-Id: I16311c31f2b83c246e96c2c01975f45011548fa4
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java4
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;