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

Commit e6b03d09 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 9dfd7d0a to master 

Change-Id: I9fbee3209b7fe5c7b5b42b62309eb60dc49bf9e2
parents a8eedaee 9dfd7d0a

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5766,6 +5766,8 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";

    field public static final java.lang.String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";

    field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";

    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

    field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";

    field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";

    field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";

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

+32 −0
Original line number Diff line number Diff line
@@ -891,6 +891,38 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FAKETOUCH = "android.hardware.faketouch";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device does not have a touch screen, but

     * does support touch emulation for basic events that supports distinct

     * tracking of two or more fingers.  This is an extension of

     * {@link #FEATURE_FAKETOUCH} for input devices with this capability.  Note

     * that unlike a distinct multitouch screen as defined by

     * {@link #FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT}, these kinds of input

     * devices will not actually provide full two-finger gestures since the

     * input is being transformed to cursor movement on the screen.  That is,

     * single finger gestures will move a cursor; two-finger swipes will

     * result in single-finger touch events; other two-finger gestures will

     * result in the corresponding two-finger touch event.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device does not have a touch screen, but

     * does support touch emulation for basic events that supports tracking

     * a hand of fingers (5 or more fingers) fully independently.

     * This is an extension of

     * {@link #FEATURE_FAKETOUCH} for input devices with this capability.  Note

     * that unlike a multitouch screen as defined by

     * {@link #FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND}, not all two finger

     * gestures can be detected due to the limitations described for

     * {@link #FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT}.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports live wallpapers.

data/etc/android.hardware.faketouch.multitouch.distinct.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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 indirect touch input device that supports

     independently-trackable multiple-finger multitouch. -->

<permissions>

    <feature name="android.hardware.faketouch.multitouch" />

    <feature name="android.hardware.faketouch.multitouch.distinct" />

    <feature name="android.hardware.faketouch" />

</permissions>

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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 an indirect touch input device that supports

     independently-trackable multiple-finger multitouch. -->

<permissions>

    <feature name="android.hardware.faketouch.multitouch" />

    <feature name="android.hardware.faketouch.multitouch.distinct" />

    <feature name="android.hardware.faketouch.multitouch.jazzhand" />

    <feature name="android.hardware.faketouch" />

</permissions>

data/etc/android.hardware.faketouch.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 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 devices that does not have

     a touch screen, but does have some other indirect input device such as

     a track pad. -->

<permissions>

    <feature name="android.hardware.faketouch" />

</permissions>