diff options
| author | Scott Main <smain@google.com> | 2010-08-04 17:33:33 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-08-04 17:33:33 -0700 |
| commit | 8dd87ad9440bc63bc312b06f292adcd2642b1c41 (patch) | |
| tree | be16937aaf59c2bda4e06d830ac661b4e9f084c2 | |
| parent | 5b86de94a163ce4c52ab08a9820f9d78414e1767 (diff) | |
| download | frameworks_base-8dd87ad9440bc63bc312b06f292adcd2642b1c41.zip frameworks_base-8dd87ad9440bc63bc312b06f292adcd2642b1c41.tar.gz frameworks_base-8dd87ad9440bc63bc312b06f292adcd2642b1c41.tar.bz2 | |
fix some doc errors in the resources;
add link to resource docs for ColorStateList class
Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
4 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/res/ColorStateList.java b/core/java/android/content/res/ColorStateList.java index 70baaef..bd23db4 100644 --- a/core/java/android/content/res/ColorStateList.java +++ b/core/java/android/content/res/ColorStateList.java @@ -45,7 +45,6 @@ import java.util.Arrays; * <item android:state_focused="true" android:color="@color/testcolor1"/> * <item android:state_pressed="true" android:state_enabled="false" android:color="@color/testcolor2" /> * <item android:state_enabled="false" android:color="@color/testcolor3" /> - * <item android:state_active="true" android:color="@color/testcolor4" /> * <item android:color="@color/testcolor5"/> * </selector> * </pre> @@ -56,6 +55,9 @@ import java.util.Arrays; * An item with no state spec is considered to match any set of states and is generally useful as * a final item to be used as a default. Note that if you have such an item before any other items * in the list then any subsequent items will end up being ignored. + * <p>For more information, see the guide to <a + * href="{@docRoot}guide/topics/resources/color-list-resource.html">Color State + * List Resource</a>.</p> */ public class ColorStateList implements Parcelable { diff --git a/docs/html/guide/topics/resources/color-list-resource.jd b/docs/html/guide/topics/resources/color-list-resource.jd index 449b66f..b20915c 100644 --- a/docs/html/guide/topics/resources/color-list-resource.jd +++ b/docs/html/guide/topics/resources/color-list-resource.jd @@ -55,7 +55,6 @@ In XML: <code>@[<em>package</em>:]color/<em>filename</em></code> android:state_pressed=["true" | "false"] android:state_focused=["true" | "false"] android:state_selected=["true" | "false"] - android:state_active=["true" | "false"] android:state_checkable=["true" | "false"] android:state_checked=["true" | "false"] android:state_enabled=["true" | "false"] diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index 1c3cc4d..035ddb9 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -638,7 +638,6 @@ In XML: <code>@[<em>package</em>:]drawable/<em>filename</em></code> android:state_pressed=["true" | "false"] android:state_focused=["true" | "false"] android:state_selected=["true" | "false"] - android:state_active=["true" | "false"] android:state_checkable=["true" | "false"] android:state_checked=["true" | "false"] android:state_enabled=["true" | "false"] diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd index 1f03446..a647571 100644 --- a/docs/html/guide/topics/resources/more-resources.jd +++ b/docs/html/guide/topics/resources/more-resources.jd @@ -310,7 +310,7 @@ float fontSize = res.{@link android.content.res.Resources#getDimension(int) getD <TextView android:layout_height="@dimen/textview_height" android:layout_width="@dimen/textview_width" - android:textSize="@dimen/sixteen_sp"/> + android:textSize="@dimen/font_size"/> </pre> </dl> </dd> <!-- end example --> |