diff options
| author | Justin Koh <justinkoh@google.com> | 2014-02-20 17:38:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-20 17:38:03 +0000 |
| commit | 744d3473f8a0f9f95e3fdf83670faf6d1551839e (patch) | |
| tree | 4bec200e9dd102028dfe47443a31497c4a8f4613 | |
| parent | d43ad2f35abcc647f7985abd09ed9de5899faf18 (diff) | |
| parent | b5731f091c711a617e24ceb04cd7a1cc4ef1f717 (diff) | |
| download | frameworks_base-744d3473f8a0f9f95e3fdf83670faf6d1551839e.zip frameworks_base-744d3473f8a0f9f95e3fdf83670faf6d1551839e.tar.gz frameworks_base-744d3473f8a0f9f95e3fdf83670faf6d1551839e.tar.bz2 | |
Merge "Add hardware feature describing a watch." into klp-modular-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d0bf458..046775e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7335,6 +7335,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand"; field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; + field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int GET_ACTIVITIES = 1; // 0x1 diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 485ee68..ddf0ed6 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1249,6 +1249,15 @@ public abstract class PackageManager { public static final String FEATURE_TELEVISION = "android.hardware.type.television"; /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: This is a device dedicated to showing UI + * on a watch. A watch here is defined to be a device worn on the body, perhaps on + * the wrist. The user is very close when interacting with the device. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_WATCH = "android.hardware.type.watch"; + + /** * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: * The device supports printing. */ |