summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chet Haase <chet@google.com> 2011-05-06 14:13:05 -0700
committer Chet Haase <chet@google.com> 2011-05-06 14:14:20 -0700
commitc54ed966f78b9ee8117931859d62faa6f11fe018 (patch)
tree4e1511aa1408128e2a88cde1a537763accaf2c0a
parent3825fef300122ffcc262e56a36a9fc36d8d084b0 (diff)
Minor javadoc enhancements
Change-Id: Ic24bb0e1e669989f0cae3a9b8fa064b38c8e7948
-rw-r--r--core/java/android/animation/LayoutTransition.java12
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java
index 22dd3c7b8daf..adfda8ee6838 100644
--- a/core/java/android/animation/LayoutTransition.java
+++ b/core/java/android/animation/LayoutTransition.java
@@ -48,6 +48,18 @@ import java.util.List;
* with setting up the basic properties of the animations used in these four situations,
* or with setting up custom animations for any or all of the four.</p>
*
+ * <p>By default, the DISAPPEARING animation begins immediately, as does the CHANGE_APPEARING
+ * animation. The other animations begin after a delay that is set to the default duration
+ * of the animations. This behavior facilitates a sequence of animations in transitions as
+ * follows: when an item is being added to a layout, the other children of that container will
+ * move first (thus creating space for the new item), then the appearing animation will run to
+ * animate the item being added. Conversely, when an item is removed from a container, the
+ * animation to remove it will run first, then the animations of the other children in the
+ * 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>
+ *
* <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
* basic animation properties, such as the duration, start delay, and properties being animated.
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index ea40bf4555cd..80a7beddc804 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1493,7 +1493,7 @@ void OpenGLRenderer::drawLines(float* points, int count, SkPaint* paint) {
int generatedVerticesCount = 0;
int verticesCount = count;
if (count > 4) {
- // Polyline: account for extra vertices needed for continous tri-strip
+ // Polyline: account for extra vertices needed for continuous tri-strip
verticesCount += (count - 4);
}