summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2016-09-26 22:46:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-26 22:46:58 +0000
commit0b498d613929d35d97c86d590691867f6347204f (patch)
tree2a7432b4eefd991cf9387f598b53392338d5f117
parentb38bfa1679eb613078cde16d99afa190c2b99ef2 (diff)
parent5232329b4e5c00622e3f1d87deec8130aa3b917f (diff)
Merge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap" into nyc-dev
-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