summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2015-06-30 23:20:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 23:20:31 +0000
commitc2756505b24801d4580383734a58bdf5f916e093 (patch)
tree39e0de00f3b1bba4982529e1c0074f902615efd7 /docs/html/training
parent49a2a6985d49b7356fd319266dd502f27964e69d (diff)
parent810c1c868e7a447baf95c9f9aac1697b1ee861ba (diff)
downloadframeworks_base-c2756505b24801d4580383734a58bdf5f916e093.zip
frameworks_base-c2756505b24801d4580383734a58bdf5f916e093.tar.gz
frameworks_base-c2756505b24801d4580383734a58bdf5f916e093.tar.bz2
Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/material/drawables.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/training/material/drawables.jd b/docs/html/training/material/drawables.jd
index a2de8e9..c58075e 100644
--- a/docs/html/training/material/drawables.jd
+++ b/docs/html/training/material/drawables.jd
@@ -36,8 +36,9 @@ alpha masks. You can tint them with color resources or theme attributes that res
resources (for example, <code>?android:attr/colorPrimary</code>). Usually, you create these assets
only once and color them automatically to match your theme.</p>
-<p>You can apply a tint to {@link android.graphics.drawable.BitmapDrawable} or {@link
-android.graphics.drawable.NinePatchDrawable} objects with the {@code setTint()} method. You can
+<p>You can apply a tint to {@link android.graphics.drawable.BitmapDrawable}, {@link
+android.graphics.drawable.NinePatchDrawable} or {@link
+android.graphics.drawable.VectorDrawable} objects with the {@code setTint()} method. You can
also set the tint color and mode in your layouts with the <code>android:tint</code> and
<code>android:tintMode</code> attributes.</p>