From b0c8c214d49c4fea12280e465de518b8d8236007 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Wed, 19 Jun 2024 15:23:32 +0800 Subject: Sets Anim options to task for overriding task transition This CL sets AnimationOptions to the task target if the AnimationOptions declare to override task transition. Test: atest FlickerTestsAppLaunch2:OverrideTaskTransitionTest Fixes: 345498368 Flag: EXEMPT bugfix Change-Id: I18812b98caba703502f1e339505390c6f5cfd3b2 --- services/core/java/com/android/server/wm/Transition.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 86c6f8db8899..1f9035f4e47d 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1893,7 +1893,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { } else { final List changes = info.getChanges(); for (int i = changes.size() - 1; i >= 0; --i) { - if (mTargets.get(i).mContainer.asActivityRecord() != null) { + final WindowContainer container = mTargets.get(i).mContainer; + if (container.asActivityRecord() != null + || (container.asTask() != null + && mOverrideOptions.getOverrideTaskTransition())) { changes.get(i).setAnimationOptions(mOverrideOptions); } } -- cgit v1.2.3-59-g8ed1b