Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair

Browse Source 
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
This commit is contained in:
Dirk Dougherty
2010-01-11 11:38:04 -08:00
committed by Android Git Automerger
parent 6c87c77de4 595f48b2a4
commit 6b113b1a82
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/html/guide/appendix/api-levels.jd
View File

@@ -83,6 +83,7 @@ Android platform.</p>
<table>
<tr><th>Platform Version</th><th>API Level</th></tr>
<tr><td>Android 2.1</td><td>7</td></tr>
<tr><td>Android 2.0.1</td><td>6</td></tr>
<tr><td>Android 2.0</td><td>5</td></tr>
<tr><td>Android 1.6</td><td>4</td></tr>

6
docs/html/guide/practices/screens_support.jd
View File

@@ -289,11 +289,11 @@ Alternate Resources</a>.
compatibility features that together manage the rendering of application
resources in an appropriate way for the current device screen. The platform
handles most of the work of rendering your application, but also gives you two
key ways to control the way your application is displayed, if you need or want
key ways to control how your application is displayed, if you need or want
to use them:</p>
<ul>
<li>The platform provides a set of resource qualifiers that let you provide
<li>The platform supports a set of resource qualifiers that let you provide
size- and density-specific resources, if needed. The qualifiers for
size-specific resources are <code>large</code>, <code>normal</code>, and
<code>small</code>, and those for density-specific resources are
@@ -303,7 +303,7 @@ size-specific resources are <code>large</code>, <code>normal</code>, and
<li>The platform also provides a
<a href="{@docRoot}guide/topics/manifest/supports-screens-element.html">
<code>&lt;supports-screens&gt;</code></a>
element, whose attributes
manifest element, whose attributes
<code>android:largeScreens</code>, <code>android:normalScreens</code>, and
<code>android:smallScreens</code> let you specify what generalized screen sizes
your application supports. A fourth attribute, <code>android:anyDensity</code>,

6
docs/html/guide/topics/manifest/uses-feature-element.jd
View File

@@ -5,11 +5,9 @@ page.title=&lt;uses-feature&gt;
<dt>syntax:</dt>
<dd>
<pre class="stx">
&lt;uses-feature android:<a href="#glEsVersion">glEsVersion</a>="<em>integer</em>"
<pre class="stx">&lt;uses-feature android:<a href="#glEsVersion">glEsVersion</a>="<em>integer</em>"
android:<a href="#name">name</a>="<em>string</em>"
android:<a href="#required">required</a>=["true" | "false"] /&gt;
</pre>
android:<a href="#required">required</a>=["true" | "false"] /&gt;</pre>
</dd>
<dt>contained in:</dt>

2
docs/html/index.jd
View File

@@ -47,7 +47,7 @@ home=true
<td class="imageCell"><a href="{@docRoot}sdk/index.html"><img src="{@docRoot}assets/images/icon_download.jpg" style="padding:0" /></a></td>
<td>
<h2 class="green">Download</h2>
<p>The Android SDK the tools, sample code, and docs you need to create great apps.</p>
<p>The Android SDK has the tools, sample code, and docs you need to create great apps.</p>
<p><a href="{@docRoot}sdk/index.html">Learn more &raquo;</a></p>
</td>
</tr>

3
docs/html/sdk/index.jd
View File

@@ -68,7 +68,8 @@ see <a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.
the latest documentation package. The documentation covers all versions of the
API and lets you filter out those versions that your application won't support.
Once installed, the documentation is also available to you directly from the
Eclipse IDE. </p>
Eclipse IDE. When you are online, you can always access the latest documentation
at the Android Developers site.</p>
<p><strong>5. Download other SDK components</strong></p>