diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-09-03 15:14:57 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 15:14:57 -0700 |
commit | 6c82f673f6c01cdcf7ede82c67601fbd53d090f3 (patch) | |
tree | 144beabb206bb3ed104a48f716bc01bb5ebfb423 /core/java | |
parent | 1ab9d1289b0e31033ba87490f185732e08bed7b5 (diff) | |
parent | fd3f44b38882c74c10aff0e238ee4ad9fcd8b724 (diff) | |
download | frameworks_base-6c82f673f6c01cdcf7ede82c67601fbd53d090f3.zip frameworks_base-6c82f673f6c01cdcf7ede82c67601fbd53d090f3.tar.gz frameworks_base-6c82f673f6c01cdcf7ede82c67601fbd53d090f3.tar.bz2 |
am fd3f44b3: am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
Merge commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724'
* commit 'fd3f44b38882c74c10aff0e238ee4ad9fcd8b724':
Adding a feature denoting support for 5 or more fully
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 460328d..8963d0c 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -816,6 +816,15 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device's touch screen is capable of + * tracking a full hand of fingers fully independently -- that is, 5 or + * more simultaneous independent pointers. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports live wallpapers. */ @SdkConstant(SdkConstantType.FEATURE) |