Skip to content

Commit 8dd87ad

Browse files
committed
fix some doc errors in the resources;
add link to resource docs for ColorStateList class Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
1 parent 5b86de9 commit 8dd87ad

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

core/java/android/content/res/ColorStateList.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
* <item android:state_focused="true" android:color="@color/testcolor1"/>
4646
* <item android:state_pressed="true" android:state_enabled="false" android:color="@color/testcolor2" />
4747
* <item android:state_enabled="false" android:color="@color/testcolor3" />
48-
* <item android:state_active="true" android:color="@color/testcolor4" />
4948
* <item android:color="@color/testcolor5"/>
5049
* </selector>
5150
* </pre>
@@ -56,6 +55,9 @@
5655
* An item with no state spec is considered to match any set of states and is generally useful as
5756
* a final item to be used as a default. Note that if you have such an item before any other items
5857
* in the list then any subsequent items will end up being ignored.
58+
* <p>For more information, see the guide to <a
59+
* href="{@docRoot}guide/topics/resources/color-list-resource.html">Color State
60+
* List Resource</a>.</p>
5961
*/
6062
public class ColorStateList implements Parcelable {
6163

docs/html/guide/topics/resources/color-list-resource.jd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ In XML: <code>@[<em>package</em>:]color/<em>filename</em></code>
5555
android:state_pressed=["true" | "false"]
5656
android:state_focused=["true" | "false"]
5757
android:state_selected=["true" | "false"]
58-
android:state_active=["true" | "false"]
5958
android:state_checkable=["true" | "false"]
6059
android:state_checked=["true" | "false"]
6160
android:state_enabled=["true" | "false"]

docs/html/guide/topics/resources/drawable-resource.jd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,6 @@ In XML: <code>@[<em>package</em>:]drawable/<em>filename</em></code>
638638
android:state_pressed=["true" | "false"]
639639
android:state_focused=["true" | "false"]
640640
android:state_selected=["true" | "false"]
641-
android:state_active=["true" | "false"]
642641
android:state_checkable=["true" | "false"]
643642
android:state_checked=["true" | "false"]
644643
android:state_enabled=["true" | "false"]

docs/html/guide/topics/resources/more-resources.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ float fontSize = res.{@link android.content.res.Resources#getDimension(int) getD
310310
&lt;TextView
311311
android:layout_height="@dimen/textview_height"
312312
android:layout_width="@dimen/textview_width"
313-
android:textSize="@dimen/sixteen_sp"/>
313+
android:textSize="@dimen/font_size"/>
314314
</pre>
315315
</dl>
316316
</dd> <!-- end example -->

0 commit comments

Comments
 (0)