am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo

Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken

* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
  Adding a feature definition for touchscreens that was overlooked in the last
This commit is contained in:
Dan Morrill
2010-04-05 15:03:48 -07:00
committed by Android Git Automerger
3 changed files with 30 additions and 0 deletions

View File

@@ -736,6 +736,14 @@ public abstract class PackageManager {
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's display has a touch screen.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's touch screen supports