summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Koh <justinkoh@google.com>2014-02-13 16:06:59 -0800
committerJustin Koh <justinkoh@google.com>2014-02-18 18:12:24 -0800
commitb5731f091c711a617e24ceb04cd7a1cc4ef1f717 (patch)
tree4fd466b52221cce5dc5d726640134a9edc92083c
parentdb0f3e825fb4da01f887c41a877708734b0899e3 (diff)
downloadframeworks_base-b5731f091c711a617e24ceb04cd7a1cc4ef1f717.zip
frameworks_base-b5731f091c711a617e24ceb04cd7a1cc4ef1f717.tar.gz
frameworks_base-b5731f091c711a617e24ceb04cd7a1cc4ef1f717.tar.bz2
Add hardware feature describing a watch.
Add hardware feature describing a watch so that hardware can specify that it is a device that is worn on the body (perhaps the wrist). Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/content/pm/PackageManager.java9
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.
*/