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

am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo

Browse Source 
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp

* commit '21390f08138801f9e008917c0c0149839a80d002':
  Adding a feature definition for touchscreens that was overlooked in the last
This commit is contained in:
Dan Morrill
2010-04-05 14:59:47 -07:00
committed by Android Git Automerger
parent 16197a246f 21390f0813
commit ca5e7de82b
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/8.xml
View File

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

11
api/current.xml
View File

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

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

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