diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index fec6a980e305f..ef98a6a0316fe 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -3,6 +3,32 @@ parent.title=The AndroidManifest.xml File
parent.link=manifest-intro.html
@jd:body
+
- syntax:
@@ -452,7 +478,7 @@ feature support, for all devices.
-Testing the features required by your application
+Testing the features required by your application
You can use the aapt tool, included in the Android SDK, to
determine how Android Market will filter your application, based on its declared
@@ -516,7 +542,7 @@ in a separate <uses-feature> element.
| Feature Type |
Feature Descriptor |
- Description |
+ Description |
Comments |
@@ -545,9 +571,9 @@ is sensitive to delays or lag in sound input or output.
android.hardware.camera.autofocus |
Subfeature. The application uses the device camera's autofocus capability. |
- If declared with the "android:required="true"
-attribute, these subfeatures implicitly declare the
-android.hardware.camera parent feature. |
+ These subfeatures implicitly declare the
+android.hardware.camera parent feature, unless declared with
+android:required="false". |
android.hardware.camera.flash |
@@ -569,9 +595,9 @@ location, such as GPS location, network location, or cell location.
android.hardware.location.network |
Subfeature. The application uses coarse location coordinates obtained from
a network-based geolocation system supported on the device. |
- If declared with the "android:required="true"
-attribute, these subfeatures implicitly declare the
-android.hardware.location parent feature. |
+ These subfeatures implicitly declare the
+android.hardware.location parent feature, unless declared with
+android:required="false". |
android.hardware.location.gps |
@@ -586,9 +612,9 @@ from a Global Positioning System receiver on the device.
|
- | Near Field Communications |
+ NFC |
android.hardware.nfc |
- The application uses NFC radio features in the device. |
+ The application uses Near Field Communications radio features in the device. |
|
@@ -635,9 +661,9 @@ radio with data communication services.
android.hardware.telephony.cdma |
Subfeature. The application uses CDMA telephony radio features on the
device. |
- If declared with the "android:required="true"
-attribute, these subfeatures implicitly declare the
-android.hardware.telephony parent feature. |
+ These subfeatures implicitly declare the
+android.hardware.telephony parent feature, unless declared with
+android:required="false". |
android.hardware.telephony.gsm |
@@ -654,32 +680,33 @@ up", and drag.
emulated touchscreen (or better). A device that offers an emulated touchscreen provides a user input
system that can emulate a subset of touchscreen capabilities. An example of such an input system is
a mouse or remote control that drives an on-screen cursor. If your application does not require
-complicated gestures and you want your application available to devices with an emulated
-touchscreen, you should declare this feature.
+complicated gestures and you want your application available to devices that use an on-screen
+cursor to emulate touch events, you should declare this feature.
android.hardware.touchscreen |
The application uses touchscreen capabilities, for gestures more interactive
than basic touches, such as a fling. This is a superset of the faketouch features. |
- |
+ By default, this is assumed to be required, unless you declare
+android.hardware.faketouch (the subset touch mode). As such, your application is
+not available to devices that provide only an emulated touch interface ("fake touch") by
+default. |
android.hardware.touchscreen.multitouch |
The application uses basic two-point multitouch capabilities on the device
screen, such as for pinch gestures, but does not need to track touches independently. This
is a superset of touchscreen features. |
- If declared with the "android:required="true" attribute, this
-implicitly declares the android.hardware.touchscreen
-parent feature. |
+ This implicitly declares the android.hardware.touchscreen parent feature, unless
+declared with android:required="false". |
android.hardware.touchscreen.multitouch.distinct |
Subfeature. The application uses advanced multipoint multitouch
capabilities on the device screen, such as for tracking two or more points fully
independently. This is a superset of multitouch features. |
- If declared with the "android:required="true" attribute, this
-implicitly declares the
-android.hardware.touchscreen.multitouch parent feature. |
+ This implicitly declares the android.hardware.touchscreen.multitouch
+parent feature, unless declared with android:required="false". |
android.hardware.touchscreen.multitouch.jazzhand |
@@ -688,6 +715,21 @@ capabilities on the device screen, for tracking up to five points fully
independently. This is a superset of distinct multitouch features.
+
+ | USB |
+ android.hardware.usb.host |
+ The application uses USB host mode features (behaves as the host and connects to USB
+devices). |
+ |
+
+
+
+ android.hardware.usb.accessory |
+ The application uses USB accessory features (behaves as the USB device and connects to USB
+hosts). |
+ |
+
+
| Wifi |
android.hardware.wifi |
@@ -729,9 +771,8 @@ in a separate <uses-feature> element.
android.software.sip.voip |
Subfeature. The application uses SIP-based VOIP service on the device.
|
- If declared with the "android:required="true" attribute, this
-subfeature implicitly declares the android.software.sip
-parent feature. |
+ This subfeature implicitly declares the android.software.sip parent feature,
+unless declared with android:required="false". |