diff options
author | Scott Main <smain@google.com> | 2010-12-20 11:29:32 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-20 11:29:32 -0800 |
commit | cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba (patch) | |
tree | 440cab641f52b5932847571d6ac225949db7376a /docs/html | |
parent | a1608902f95dc8ff31a52c1f1c384829a803a701 (diff) | |
parent | 0d1e38ef99252cb14e6bcc4b3135021da025330f (diff) | |
download | frameworks_base-cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba.zip frameworks_base-cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba.tar.gz frameworks_base-cdd76cf5873ee709d04ffeda6e56c5f15bfa1bba.tar.bz2 |
am 0d1e38ef: cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
* commit '0d1e38ef99252cb14e6bcc4b3135021da025330f':
cherrypick Change-Id: I58e21f636e15d4b1522b66b16ffd48f1eb31308c docs: misc fixes to the drawable reference
Diffstat (limited to 'docs/html')
-rw-r--r-- | docs/html/guide/topics/resources/drawable-resource.jd | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index 129462e..d9f619f 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -474,7 +474,7 @@ In XML: <code>@[<em>package</em>:]drawable/<em>filename</em></code> android:right="<em>dimension</em>" android:bottom="<em>dimension</em>" android:left="<em>dimension</em>" /> -</selector> +</layer-list> </pre> </dd> @@ -906,7 +906,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" > android:right="<em>dimension</em>" android:bottom="<em>dimension</em>" android:left="<em>dimension</em>" /> -</selector> +</transition> </pre> </dd> @@ -926,8 +926,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" > </dl> </dd> <dt id="transition-item-element"><code><item></code></dt> - <dd>Defines a drawable to place in the layer drawable, in a position defined by its attributes. -Must be a child of a <code><selector></code> element. Accepts child {@code <bitmap>} + <dd>Defines a drawable to use as part of the drawable transition. +Must be a child of a <code><transition></code> element. Accepts child {@code <bitmap>} elements. <p class="caps">attributes:</p> <dl class="atn-list"> @@ -963,7 +963,7 @@ View.findViewById()} or {@link android.app.Activity#findViewById(int) Activity.f <transition xmlns:android="http://schemas.android.com/apk/res/android"> <item android:drawable="@drawable/on" /> <item android:drawable="@drawable/off" /> -</layer-list> +</transition> </pre> <p>This layout XML applies the drawable to a View:</p> @@ -1226,11 +1226,11 @@ the right edge, a right gravity clips the left edge, and neither clips both edge <dd>XML file saved at <code>res/drawable/clip.xml</code>: <pre> <?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" +<clip xmlns:android="http://schemas.android.com/apk/res/android" android:drawable="@drawable/android" android:clipOrientation="horizontal" android:gravity="left" /> -</shape> +</clip> </pre> <p>The following layout XML applies the clip drawable to a View:</p> <pre> |