Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab847c44 authored Aug 05, 2010 by Scott Main Committed by Android Git Automerger Aug 05, 2010

am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources;...

am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class

Merge commit 'c9de8c34'

* commit 'c9de8c34':
  fix some doc errors in the resources;

parents 613d363c c9de8c34

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"]

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"]

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 -->