diff options
| author | Scott Main <smain@google.com> | 2010-12-15 11:56:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-15 11:56:04 -0800 |
| commit | 9278d3216837ad45eae13b87f04f050acb4ddafa (patch) | |
| tree | 20b75f3d7b28c4390c22a0a43cc72c9eb6f60b6a /docs | |
| parent | d88c90fb0805b2dda5664f413b32ada5a5fa6fdc (diff) | |
| parent | 52078255dacabe9b779613b032a4dc3706b2b5d3 (diff) | |
| download | frameworks_base-9278d3216837ad45eae13b87f04f050acb4ddafa.zip frameworks_base-9278d3216837ad45eae13b87f04f050acb4ddafa.tar.gz frameworks_base-9278d3216837ad45eae13b87f04f050acb4ddafa.tar.bz2 | |
am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/resources/drawable-resource.jd | 17 |
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"> <?xml version="1.0" encoding="utf-8"?> -<<a href="#transition-element">layer-list</a> +<<a href="#transition-element">transition</a> xmlns:android="http://schemas.android.com/apk/res/android" > <<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"> |