diff options
| author | Scott Main <smain@google.com> | 2010-08-04 18:05:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 18:05:26 -0700 |
| commit | c9de8c34a32af1b305b49096ee96da4c35acd2e8 (patch) | |
| tree | 056cdbf5a9980120644b77bc96340b24cbbb90be /docs | |
| parent | ef9fd39d73877162ba200ef8b2000216133dab2e (diff) | |
| parent | 97c2d840a10813164d82571775a3566637d6c5de (diff) | |
| download | frameworks_base-c9de8c34a32af1b305b49096ee96da4c35acd2e8.zip frameworks_base-c9de8c34a32af1b305b49096ee96da4c35acd2e8.tar.gz frameworks_base-c9de8c34a32af1b305b49096ee96da4c35acd2e8.tar.bz2 | |
am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/resources/color-list-resource.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/drawable-resource.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/more-resources.jd | 2 |
3 files changed, 1 insertions, 3 deletions
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 --> |