summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Issei Suzuki <issei@google.com> 2022-02-03 15:14:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-02-03 15:14:55 +0000
commitaa45a654ab7c1072e17b3a8e8fd82d9b95eeeaff (patch)
treeafd93d7eca0063e8e30b80ff67ddad4a8beb9e63
parente9846235b32752645988cfdd59995160b1afd9c6 (diff)
parent1eaedb4bafc8d3fca79421435c23ac9d271f60ae (diff)
Merge "Add comment for locking down custom task animation."
-rw-r--r--core/java/android/app/Activity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 530666b8f1d7..e6b154bd6a2e 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -6139,6 +6139,10 @@ public class Activity extends ContextThemeWrapper
* you to specify a custom animation even when starting an activity from
* outside the context of the current top activity.
*
+ * <p>Af of {@link android.os.Build.VERSION_CODES#S} application can only specify
+ * a transition animation when the transition happens within the same task. System
+ * default animation is used for cross-task transition animations.
+ *
* @param enterAnim A resource ID of the animation resource to use for
* the incoming activity. Use 0 for no animation.
* @param exitAnim A resource ID of the animation resource to use for