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

Commit 21390f08 authored by Dan Morrill's avatar Dan Morrill Committed by Android (Google) Code Review
Browse files

Merge "Adding a feature definition for touchscreens that was overlooked in the... 

Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
parents 0db37997 b0fe033f

api/8.xml

+11 −0
Original line number Diff line number Diff line
@@ -42126,6 +42126,17 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.touchscreen&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"

 type="java.lang.String"

 transient="false"

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -45288,6 +45288,17 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.touchscreen&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"

 type="java.lang.String"

 transient="false"

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

+8 −0
Original line number Diff line number Diff line
@@ -736,6 +736,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";

    

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's display has a touch screen.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";

    

    

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device's touch screen supports