summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDan Morrill <morrildl@google.com>2010-09-03 14:30:14 -0700
committerDan Morrill <morrildl@google.com>2010-09-03 14:41:36 -0700
commit6993d3d136fed8600a3e337d710907b50d8d6e49 (patch)
treecf33f50672753a610822f39c3c1f5a4491843485 /data
parentdc243482d6e104c4a3cddaa694c2ee3c628c2c20 (diff)
downloadframeworks_base-6993d3d136fed8600a3e337d710907b50d8d6e49.zip
frameworks_base-6993d3d136fed8600a3e337d710907b50d8d6e49.tar.gz
frameworks_base-6993d3d136fed8600a3e337d710907b50d8d6e49.tar.bz2
Adding a feature denoting support for 5 or more fully
independent multitouch pointers. Change-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml24
-rw-r--r--data/etc/handheld_core_hardware.xml17
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