summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-12-03 03:32:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-12-03 03:32:18 +0000
commitd91dc6f6dd796c5e1de50b2fad2de1c65b7abc5c (patch)
treeaa169778b037730521f13ede6e008a4ddb344bb9
parentf84dfe235fdc5077de63ff8f0af1830d42a2ed99 (diff)
parent4b1dafa61466040ae37285b62fd09d0ebdaef07b (diff)
Merge "Fix transition filter for returning home transition." into main
-rw-r--r--packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java
index 6b26ac5f4692..3b66460140c9 100644
--- a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java
+++ b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java
@@ -438,7 +438,8 @@ public class IOriginTransitionsImpl extends IOriginTransitions.Stub {
if (forPredictiveBackTakeover) {
filter.mTypeSet = new int[] {TRANSIT_PREPARE_BACK_NAVIGATION};
} else {
- filter.mTypeSet = new int[] {TRANSIT_CLOSE, TRANSIT_TO_BACK};
+ filter.mTypeSet =
+ new int[] {TRANSIT_CLOSE, TRANSIT_TO_BACK, TRANSIT_OPEN, TRANSIT_TO_FRONT};
}
// The opening activity of the return transition must match the activity we just closed.