diff options
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 | ||||
| -rw-r--r-- | data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml | 24 | ||||
| -rw-r--r-- | data/etc/handheld_core_hardware.xml | 17 |
4 files changed, 57 insertions, 4 deletions
diff --git a/api/current.xml b/api/current.xml index 6b0cc23..8476d96 100644 --- a/api/current.xml +++ b/api/current.xml @@ -56248,6 +56248,17 @@ visibility="public" > </field> +<field name="FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.touchscreen.multitouch.jazzhand"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FEATURE_WIFI" type="java.lang.String" transient="false" 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) diff --git a/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml b/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml new file mode 100644 index 0000000..80bf859 --- /dev/null +++ b/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- This is the standard set of features for a touchscreen that supports + independently-trackable multiple-finger multitouch. --> +<permissions> + <feature name="android.hardware.touchscreen" /> + <feature name="android.hardware.touchscreen.multitouch" /> + <feature name="android.hardware.touchscreen.multitouch.distinct" /> + <feature name="android.hardware.touchscreen.multitouch.jazzhand" /> +</permissions> diff --git a/data/etc/handheld_core_hardware.xml b/data/etc/handheld_core_hardware.xml index efca4c2..a3c9f6d 100644 --- a/data/etc/handheld_core_hardware.xml +++ b/data/etc/handheld_core_hardware.xml @@ -38,10 +38,19 @@ <!-- devices with a front facing camera must include android.hardware.camera.front.xml --> <!-- devices with WiFi must also include android.hardware.wifi.xml --> - <!-- devices with limited/gestural multitouch must also include - android.hardware.touchscreen.multitouch.xml --> - <!-- devices with full multitouch must also include - android.hardware.touchscreen.multitouch.distinct.xml --> + <!-- devices that support multitouch must include the most appropriate one + of these files: + + If only partial (non-independent) pointers are supported: + android.hardware.touchscreen.multitouch.xml + + If up to 4 independently tracked pointers are supported: + include android.hardware.touchscreen.multitouch.distinct.xml + + If 5 or more independently tracked pointers are supported: + include android.hardware.touchscreen.multitouch.jazzhand.xml + + ONLY ONE of the above should be included. --> <!-- devices with an ambient light sensor must also include android.hardware.sensor.light.xml --> <!-- devices with a proximity sensor must also include |