diff options
| author | 2014-09-29 13:19:00 -0700 | |
|---|---|---|
| committer | 2014-09-30 15:02:24 -0700 | |
| commit | c3fdffa98136bdad1fee9c77598d541d792920e1 (patch) | |
| tree | 0423694c992cce31d0776b25e4a53d0805b8ba97 | |
| parent | b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7 (diff) | |
Correct the documentation for VectorDrawable
We missed the alpha for the vector drawable root level in the documentation.
And the animation target can be vector drawable itself for the alpha value,
which is more than path and group object.
b/17696183
Change-Id: Ic9d441fbdf411dad92718ae5adbc6655fe708453
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 8ea181407c25..719adcacfb14 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5365,11 +5365,11 @@ <attr name="drawable" /> </declare-styleable> - <!-- Defines the target path or group used in the AnimatedVectorDrawable. --> + <!-- Defines the target used in the AnimatedVectorDrawable. --> <declare-styleable name="AnimatedVectorDrawableTarget"> - <!-- The name of this target path or group --> + <!-- The name of the target path, group or vector drawable --> <attr name="name" /> - <!-- The animation for this target path or group --> + <!-- The animation for the target path, group or vector drawable --> <attr name="animation" /> </declare-styleable> diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 80148373d320..4c83e5568725 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -57,6 +57,8 @@ import java.util.Stack; * <dl> * <dd>Used to defined a vector drawable * <dl> + * <dt><code>android:name</code></dt> + * <dd>Defines the name of this vector drawable.</dd> * <dt><code>android:width</code></dt> * <dd>Used to defined the intrinsic width of the drawable. * This support all the dimension units, normally specified with dp.</dd> @@ -76,6 +78,8 @@ import java.util.Stack; * <dt><code>android:autoMirrored</code></dt> * <dd>Indicates if the drawable needs to be mirrored when its layout direction is * RTL (right-to-left).</dd> + * <dt><code>android:alpha</code></dt> + * <dd>The opacity of this drawable.</dd> * </dl></dd> * </dl> * @@ -85,6 +89,8 @@ import java.util.Stack; * The transformations are defined in the same coordinates as the viewport. * And the transformations are applied in the order of scale, rotate then translate. * <dl> + * <dt><code>android:name</code></dt> + * <dd>Defines the name of the group.</dd> * <dt><code>android:rotation</code></dt> * <dd>The degrees of rotation of the group.</dd> * <dt><code>android:pivotX</code></dt> |