summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-08-26 12:31:09 -0700
committerScott Main <smain@google.com>2013-08-26 12:49:39 -0700
commitd608d5e3fa08cd9935f03144b192ea5934c715a8 (patch)
treedae5d6b4bd3fcdbb22c8427901f5f7b353cccb83 /docs/html/guide/topics
parent2c30fe8aedc5af2845e97b9005d6dce570f9d8eb (diff)
downloadframeworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.zip
frameworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.tar.gz
frameworks_base-d608d5e3fa08cd9935f03144b192ea5934c715a8.tar.bz2
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/manifest/uses-feature-element.jd43
1 files changed, 33 insertions, 10 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index af35540..95f62a5 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -552,8 +552,8 @@ is sensitive to delays or lag in sound input or output.</td>
<td>Bluetooth</td>
<td><code>android.hardware.bluetooth</td>
<td>The application uses Bluetooth radio features in the device.</td>
-<td>
-</td>
+ <td>If your app uses Bluetooth Low Energy, also declare
+ {@code android.software.bluetooth_le}.</td>
</tr>
<tr>
<td rowspan="5">Camera</td>
@@ -849,26 +849,49 @@ in a separate <code>&lt;uses-feature&gt;</code> element. </p>
<th>Feature</th>
<th>Attribute Value</th>
<th>Description</th>
- <th>Comments</th>
+</tr>
+<tr>
+ <td>App Widgets</td>
+ <td><code>android.software.app_widgets</code></td>
+ <td>The application uses or provides App Widgets and should be installed only on devices
+ that include a Home screen or similar location where users can embed App Widgets.</td>
+</tr>
+<tr>
+ <td>Bluetooth Low Energy</td>
+ <td><code>android.software.bluetooth_le</code></td>
+ <td><p>The application uses Bluetooth Low Energy APIs and should be installed only on devices
+ that are capable of communicating with other devices via Bluetooth Low Energy.
+ <p>This implicitly also declares the {@code android.hardware.bluetooth} feature.</td>
+</tr>
+<tr>
+ <td>Home Screen</td>
+ <td><code>android.software.home_screen</code></td>
+ <td>The application behaves as a Home screen replacement and should be installed only on
+ devices that support third-party Home screen apps.</td>
+</tr>
+<tr>
+ <td>Input Method</td>
+ <td><code>android.software.input_methods</code></td>
+ <td>The application provides a custom input method and should be installed only on devices that
+ support third-party input methods.</td>
</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>
+ <td>The application uses or provides Live Wallpapers and should be installed only on devices that
+ support Live Wallpapers.</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>The application uses SIP service on the device and should be installed only on devices that
+ support SIP.
</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>This subfeature implicitly declares the <code>android.software.sip</code> parent feature,
+ <td><p>Subfeature. The application uses SIP-based VOIP service on the device.
+ <p>This subfeature implicitly declares the <code>android.software.sip</code> parent feature,
unless declared with <code>android:required="false"</code>.</td>
</tr>
</table>