summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wilsonshih <wilsonshih@google.com> 2023-10-17 08:06:32 +0000
committer Wei Sheng Shih <wilsonshih@google.com> 2023-10-17 09:57:42 +0000
commite2c91481ed91e58d74380f4f0ffcd6ac94736260 (patch)
treefb8bd6bbbff072b01f0228b80547d68434a2d744
parentbef66acae52025287434f27a6c37f81be562f390 (diff)
Respect no animation request when calling moveTaskToFront.
Seems missing to add this flag while move task to front when running shell transition. Bug: 290999345 Test: verify with sample app which there should be no transition animation when launch activity with FLAG_ACTIVITY_NO_ANIMATION. Change-Id: Ibefc0dbd5cafcaea89f6ed5747facf38b6357cdb
-rw-r--r--services/core/java/com/android/server/wm/Task.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 83856153a709..dca0ed27f133 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5648,6 +5648,8 @@ class Task extends TaskFragment {
if (noAnimation) {
mDisplayContent.prepareAppTransition(TRANSIT_NONE);
mTaskSupervisor.mNoAnimActivities.add(top);
+ mTransitionController.collect(top);
+ mTransitionController.setNoAnimation(top);
ActivityOptions.abort(options);
} else {
updateTransitLocked(TRANSIT_TO_FRONT, options);