summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-12-14 11:00:44 -0800
committerScott Main <smain@google.com>2010-12-15 11:49:42 -0800
commit52078255dacabe9b779613b032a4dc3706b2b5d3 (patch)
tree2bc5f688a326c2ed22a74a0065dda51dbaf103d0 /docs
parent6390fa6bdf50a3bf10cd6c54328397fe709f7c37 (diff)
downloadframeworks_base-52078255dacabe9b779613b032a4dc3706b2b5d3.zip
frameworks_base-52078255dacabe9b779613b032a4dc3706b2b5d3.tar.gz
frameworks_base-52078255dacabe9b779613b032a4dc3706b2b5d3.tar.bz2
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd
docs: fix bug 3216642 Change-Id: Ic42d97d4e67a09dc4e366862e2b72ff92f152b85
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/resources/drawable-resource.jd17
1 files changed, 9 insertions, 8 deletions
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd
index 79ce669..129462e 100644
--- a/docs/html/guide/topics/resources/drawable-resource.jd
+++ b/docs/html/guide/topics/resources/drawable-resource.jd
@@ -32,12 +32,16 @@ android.graphics.drawable.LayerDrawable}.</dd>
for different states (for example, to use a different image when a button is pressed).
Creates a {@link android.graphics.drawable.StateListDrawable}.</dd>
<dt><a href="#LevelList">Level List</a></dt>
- <dd>An XML file that defines a Drawable that manages a number of alternate Drawables, each
+ <dd>An XML file that defines a drawable that manages a number of alternate Drawables, each
assigned a maximum numerical value. Creates a {@link
android.graphics.drawable.LevelListDrawable}.</dd>
<dt><a href="#Transition">Transition Drawable</a></dt>
- <dd>An XML file that defines a Drawable that can cross-fade between two drawable resources.
+ <dd>An XML file that defines a drawable that can cross-fade between two drawable resources.
Creates a {@link android.graphics.drawable.TransitionDrawable}.</dd>
+ <dt><a href="#Inset">Inset Drawable</a></dt>
+ <dd>An XML file that defines a drawable that insets another drawable by a specified distance.
+This is useful when a View needs a background drawble that is smaller than the View's actual
+bounds.</dd>
<dt><a href="#Clip">Clip Drawable</a></dt>
<dd>An XML file that defines a drawable that clips another Drawable based on this Drawable's
current level value. Creates a {@link android.graphics.drawable.ClipDrawable}.</dd>
@@ -893,7 +897,7 @@ In XML: <code>@[<em>package</em>:]drawable/<em>filename</em></code>
<dd>
<pre class="stx">
&lt;?xml version="1.0" encoding="utf-8"?>
-&lt;<a href="#transition-element">layer-list</a>
+&lt;<a href="#transition-element">transition</a>
xmlns:android="http://schemas.android.com/apk/res/android" &gt;
&lt;<a href="#transition-item-element">item</a>
android:drawable="@[package:]drawable/<em>drawable_resource</em>"
@@ -994,13 +998,10 @@ drawable.startTransition(500);
-
-
-
<h2 id="Inset">Inset Drawable</h2>
-<p>A drawable defined in XML that insets another drawable by a specified distance. This is used when
-a View needs a background that is smaller than the View's actual bounds.</p>
+<p>A drawable defined in XML that insets another drawable by a specified distance. This is useful
+when a View needs a background that is smaller than the View's actual bounds.</p>
<dl class="xml">