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

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

Browse Source 
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken

* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
  Adding a feature definition for touchscreens that was overlooked in the last
This commit is contained in:
Dan Morrill
2010-04-05 15:03:48 -07:00
committed by Android Git Automerger
parent 6613ffb331 ca5e7de82b
commit a03dfc0792
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" visibility="public"
> >
</field> </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" <field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"

11
api/current.xml
View File

@@ -45288,6 +45288,17 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"

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

@@ -736,6 +736,14 @@ public abstract class PackageManager {
@SdkConstant(SdkConstantType.FEATURE) @SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm"; 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 * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's touch screen supports * {@link #hasSystemFeature}: The device's touch screen supports