Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread

Browse Source 
Merge commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8' into gingerbread-plus-aosp

* commit 'e1aa82a4228d009537693253ba3a0113abbf5ab8':
  Adding a feature denoting support for 5 or more fully
This commit is contained in:
Dianne Hackborn
2010-09-03 15:10:24 -07:00
committed by Android Git Automerger
parent 8e11c82247 e1aa82a422
commit fd3f44b388
4 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@@ -49176,6 +49176,17 @@
visibility="public"
>
</field>
<field name="FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.touchscreen.multitouch.jazzhand&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_WIFI"
type="java.lang.String"
transient="false"

9
core/java/android/content/pm/PackageManager.java
View File

@@ -799,6 +799,15 @@ public abstract class PackageManager {
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";
/**
* 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.

24
data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml Normal file
View File

@@ -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>

17
data/etc/handheld_core_hardware.xml
View File

@@ -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