am fe7006c5: am 9dbf1351: Merge "Adding faketouch feature." into honeycomb

* commit 'fe7006c5fc6f972aca2a4471ea5cd7db3947e809':
  Adding faketouch feature.
This commit is contained in:
Dan Morrill
2011-01-23 14:20:42 -08:00
committed by Android Git Automerger
3 changed files with 34 additions and 0 deletions

View File

@ -60581,6 +60581,17 @@
visibility="public"
>
</field>
<field name="FEATURE_FAKETOUCH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.faketouch&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_LIVE_WALLPAPER"
type="java.lang.String"
transient="false"

View File

@ -60700,6 +60700,17 @@
visibility="public"
>
</field>
<field name="FEATURE_FAKETOUCH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.faketouch&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_LIVE_WALLPAPER"
type="java.lang.String"
transient="false"

View File

@ -830,6 +830,18 @@ public abstract class PackageManager {
@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 does not have a touch screen, but
* does support touch emulation for basic events. For instance, the
* device might use a mouse or remote control to drive a cursor, and
* emulate basic touch pointer events like down, up, drag, etc. All
* devices that support android.hardware.touchscreen or a sub-feature are
* presumed to also support faketouch.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_FAKETOUCH = "android.hardware.faketouch";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports live wallpapers.