Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1aa82a4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Adding a feature denoting support for 5 or more fully independent... 

Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
parents 9fee0b2a 6993d3d1

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -49164,6 +49164,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"

core/java/android/content/pm/PackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -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.

data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?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>

data/etc/handheld_core_hardware.xml

+13 −4
Original line number Diff line number Diff line
@@ -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