summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2016-09-26 23:14:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-26 23:14:12 +0000
commita674109017f4c3a1a28c6593db8ffd74c59ea7c1 (patch)
tree515386cefee0425c38e3bf67f9ad59bfec45799c
parent2fa074bc37eb49063a7c234ab710c82ca07cadd8 (diff)
parent1456a0a321b91147941ea3c18e7af087d901d2eb (diff)
Merge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap am: 5232329b4e" into nyc-dev-plus-aosp
-rw-r--r--core/java/android/animation/LayoutTransition.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java
index cdd72be76805..5a23fddf1d51 100644
--- a/core/java/android/animation/LayoutTransition.java
+++ b/core/java/android/animation/LayoutTransition.java
@@ -62,7 +62,11 @@ import java.util.Map;
* layout will run (closing the gap created in the layout when the item was removed). If this
* default choreography behavior is not desired, the {@link #setDuration(int, long)} and
* {@link #setStartDelay(int, long)} of any or all of the animations can be changed as
- * appropriate.</p>
+ * appropriate. Keep in mind, however, that if you start an APPEARING animation before a
+ * DISAPPEARING animation is completed, the DISAPPEARING animation stops, and any effects from
+ * the DISAPPEARING animation are reverted. If you instead start a DISAPPEARING animation
+ * before an APPEARING animation is completed, a similar set of effects occurs for the
+ * APPEARING animation.</p>
*
* <p>The animations specified for the transition, both the defaults and any custom animations
* set on the transition object, are templates only. That is, these animations exist to hold the