summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2010-04-05 14:56:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-05 14:56:03 -0700
commit21390f08138801f9e008917c0c0149839a80d002 (patch)
tree7e1c23d69b5a9b07ceb9f6c884333151cae3b65b /core/java
parent0db37997366a4d781af48be758a9d90b6d07d7d5 (diff)
parentb0fe033ff8695418645ede29ce683949f68033c2 (diff)
downloadframeworks_base-21390f08138801f9e008917c0c0149839a80d002.zip
frameworks_base-21390f08138801f9e008917c0c0149839a80d002.tar.gz
frameworks_base-21390f08138801f9e008917c0c0149839a80d002.tar.bz2
Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/pm/PackageManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 2f512ae..68b44e7 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -738,6 +738,14 @@ public abstract class PackageManager {
/**
* 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
* multitouch sufficient for basic two-finger gesture detection.
*/