diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-11-11 11:52:05 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2010-12-06 16:57:09 -0800 |
| commit | 904785be3b6dc1ec532532bbee019dbbac26cda4 (patch) | |
| tree | 0d08cf9d63cab787d778c3efc070ee8a095b292c /docs/html/guide | |
| parent | 407b4e91fe7627545b8110e683953353236b4543 (diff) | |
| download | frameworks_base-904785be3b6dc1ec532532bbee019dbbac26cda4.zip frameworks_base-904785be3b6dc1ec532532bbee019dbbac26cda4.tar.gz frameworks_base-904785be3b6dc1ec532532bbee019dbbac26cda4.tar.bz2 | |
cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
Change-Id: Iac08560728b3c6783ee6fcbd31ec6aca58b156d3
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/appendix/api-levels.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 54 |
2 files changed, 28 insertions, 27 deletions
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index c5112f6..50e5149 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -83,6 +83,7 @@ Android platform.</p> <table> <tr><th>Platform Version</th><th>API Level</th></tr> + <tr><td>Android 2.3</td><td>9</td></tr> <tr><td>Android 2.2</td><td>8</td></tr> <tr><td>Android 2.1</td><td>7</td></tr> <tr><td>Android 2.0.1</td><td>6</td></tr> diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index b5b30f6..6652aff 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -627,22 +627,6 @@ the device.</td> <td></td> </tr> <tr> - <td rowspan="2">SIP/VOIP</td> - <td><code>android.hardware.sip</code></td> - <td>The application uses SIP service on the device. - </td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sip.voip</code></td> - <td>Subfeature. The application uses SIP-based VOIP service on the device. - </td> - <td>If declared with the <code>"android:required="true"</code> attribute, this -subfeature implicitly declares the <code>android.hardware.sip</code> -parent feature.</td> -</tr> - -<tr> <td rowspan="3">Telephony</td> <td><code>android.hardware.telephony</code></td> <td>The application uses telephony features on the device, such as telephony @@ -711,17 +695,33 @@ in a separate <code><uses-feature></code> element. </p> <table> - <tr> - <th>Feature</th> - <th>Attribute Value</th> - <th>Description</th> - </tr> - <tr> - <td>Live Wallpaper</td> - <td><code>android.software.live_wallpaper</code></td> - <td>The application uses or provides Live Wallpapers. - </td> - </tr> +<tr> + <th>Feature</th> + <th>Attribute Value</th> + <th>Description</th> + <th>Comments</th> +</tr> +<tr> + <td>Live Wallpaper</td> + <td><code>android.software.live_wallpaper</code></td> + <td>The application uses or provides Live Wallpapers.</td> + <td></td> +</tr> +<tr> + <td rowspan="2">SIP/VOIP</td> + <td><code>android.software.sip</code></td> + <td>The application uses SIP service on the device. + </td> + <td></td> +</tr> +<tr> + <td><code>android.software.sip.voip</code></td> + <td>Subfeature. The application uses SIP-based VOIP service on the device. + </td> + <td>If declared with the <code>"android:required="true"</code> attribute, this +subfeature implicitly declares the <code>android.software.sip</code> +parent feature.</td> +</tr> </table> |