summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-07-14 10:10:38 -0700
committerScott Main <smain@google.com>2011-07-27 11:48:22 -0700
commit56def45c1ee104f87d649d6714c9caa1dfa3b339 (patch)
treed9d8dcd4d0d91c2ab193f9c122580fd96e029755 /docs
parent3e485d07a47f18595446dcd217907a1196fa1923 (diff)
downloadframeworks_base-56def45c1ee104f87d649d6714c9caa1dfa3b339.zip
frameworks_base-56def45c1ee104f87d649d6714c9caa1dfa3b339.tar.gz
frameworks_base-56def45c1ee104f87d649d6714c9caa1dfa3b339.tar.bz2
cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01
docs: fix shapedrawable doc error issue 5030364 Change-Id: I5bc56eb659eabd7e5069d1d7b9c4884f387a61ad
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/resources/drawable-resource.jd6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd
index 89c85e2..912b6fd 100644
--- a/docs/html/guide/topics/resources/drawable-resource.jd
+++ b/docs/html/guide/topics/resources/drawable-resource.jd
@@ -1418,7 +1418,7 @@ bound. The value's format is XX%. For instance: 100%, 12.5%, etc.</dd>
The filename is used as the resource ID.</dd>
<dt>compiled resource datatype:</dt>
-<dd>Resource pointer to a {@link android.graphics.drawable.ShapeDrawable}.</dd>
+<dd>Resource pointer to a {@link android.graphics.drawable.GradientDrawable}.</dd>
<dt>resource reference:</dt>
@@ -1458,9 +1458,7 @@ In XML: <code>@[<em>package</em>:]drawable/<em>filename</em></code>
android:bottom="<em>integer</em>" /&gt;
&lt;<a href="#size-element">size</a>
android:width="<em>integer</em>"
- android:color="<em>color</em>"
- android:dashWidth="<em>integer</em>"
- android:dashGap="<em>integer</em>" /&gt;
+ android:height="<em>integer</em>" /&gt;
&lt;<a href="#solid-element">solid</a>
android:color="<em>color</em>" /&gt;
&lt;<a href="#stroke-element">stroke</a>