diff options
author | ztenghui <ztenghui@google.com> | 2015-03-26 20:47:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-26 20:47:44 +0000 |
commit | 304bbd117def97317bddd781b92e4642e1960d18 (patch) | |
tree | 18069b0cf96fa966450f78859a056baab1feb052 /graphics | |
parent | 9aaaa1ebb383b5aeabbdb2afb9956130e6564071 (diff) | |
parent | 0ea3aca4eb5c920fa43dab1ea027c322d23b9bda (diff) | |
download | frameworks_base-304bbd117def97317bddd781b92e4642e1960d18.zip frameworks_base-304bbd117def97317bddd781b92e4642e1960d18.tar.gz frameworks_base-304bbd117def97317bddd781b92e4642e1960d18.tar.bz2 |
Merge "Polish the documentation for VectorDrawable and AnimatedVectorDrawable"
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java | 10 | ||||
-rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index db489f6..a56e87e 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -50,8 +50,8 @@ import java.util.List; * </p> * <p> * First is the XML file for {@link android.graphics.drawable.VectorDrawable}. - * Note that we allow the animation happen on the group's attributes and path's - * attributes, which requires they are uniquely named in this xml file. Groups + * Note that we allow the animation to happen on the group's attributes and path's + * attributes, which requires they are uniquely named in this XML file. Groups * and paths without animations do not need names. * </p> * <li>Here is a simple VectorDrawable in this vectordrawable.xml file. @@ -74,7 +74,7 @@ import java.util.List; * </vector> * </pre></li> * <p> - * Second is the AnimatedVectorDrawable's xml file, which defines the target + * Second is the AnimatedVectorDrawable's XML file, which defines the target * VectorDrawable, the target paths and groups to animate, the properties of the * path and group to animate and the animations defined as the ObjectAnimators * or AnimatorSets. @@ -93,7 +93,7 @@ import java.util.List; * </animated-vector> * </pre></li> * <p> - * Last is the Animator xml file, which is the same as a normal ObjectAnimator + * Last is the Animator XML file, which is the same as a normal ObjectAnimator * or AnimatorSet. * To complete this example, here are the 2 animator files used in avd.xml: * rotation.xml and path_morph.xml. @@ -110,7 +110,7 @@ import java.util.List; * the other. Note that the paths must be compatible for morphing. * In more details, the paths should have exact same length of commands , and * exact same length of parameters for each commands. - * Note that the path string are better stored in strings.xml for reusing. + * Note that the path strings are better stored in strings.xml for reusing. * <pre> * <set xmlns:android="http://schemas.android.com/apk/res/android"> * <objectAnimator diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 5647739..b827682 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -56,21 +56,21 @@ import java.util.Stack; * <p/> * <dt><code><vector></code></dt> * <dl> - * <dd>Used to defined a vector drawable + * <dd>Used to define 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. + * <dd>Used to define the intrinsic width of the drawable. * This support all the dimension units, normally specified with dp.</dd> * <dt><code>android:height</code></dt> - * <dd>Used to defined the intrinsic height the drawable. + * <dd>Used to define the intrinsic height the drawable. * This support all the dimension units, normally specified with dp.</dd> * <dt><code>android:viewportWidth</code></dt> - * <dd>Used to defined the width of the viewport space. Viewport is basically + * <dd>Used to define the width of the viewport space. Viewport is basically * the virtual canvas where the paths are drawn on.</dd> * <dt><code>android:viewportHeight</code></dt> - * <dd>Used to defined the height of the viewport space. Viewport is basically + * <dd>Used to define the height of the viewport space. Viewport is basically * the virtual canvas where the paths are drawn on.</dd> * <dt><code>android:tint</code></dt> * <dd>The color to apply to the drawable as a tint. By default, no tint is applied.</dd> @@ -120,7 +120,7 @@ import java.util.Stack; * <dt><code>android:name</code></dt> * <dd>Defines the name of the path.</dd> * <dt><code>android:pathData</code></dt> - * <dd>Defines path string. This is using exactly same format as "d" attribute + * <dd>Defines path data using exactly same format as "d" attribute * in the SVG's path data. This is defined in the viewport space.</dd> * <dt><code>android:fillColor</code></dt> * <dd>Defines the color to fill the path (none if not present).</dd> @@ -156,7 +156,7 @@ import java.util.Stack; * <dt><code>android:name</code></dt> * <dd>Defines the name of the clip path.</dd> * <dt><code>android:pathData</code></dt> - * <dd>Defines clip path string. This is using exactly same format as "d" attribute + * <dd>Defines clip path using the same format as "d" attribute * in the SVG's path data.</dd> * </dl></dd> * </dl> |