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 /data | |
| 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 'data')
| -rw-r--r-- | data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml | 24 | ||||
| -rw-r--r-- | data/etc/handheld_core_hardware.xml | 17 |
2 files changed, 37 insertions, 4 deletions
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 |