summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Vaccaro <nvaccaro@google.com>2015-02-11 00:20:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-11 00:20:52 +0000
commit5ff571155f0a405d6f7d298c7acaddc84bb8fb26 (patch)
tree57c84bf9be6427e5acd2bade94550040f71b0a49
parentfb14e77f45fbad139a0b0c9278bd003964b8f987 (diff)
parentd0d13d822cdec4fa7214d1495137064c28ecc07e (diff)
downloadframeworks_base-5ff571155f0a405d6f7d298c7acaddc84bb8fb26.zip
frameworks_base-5ff571155f0a405d6f7d298c7acaddc84bb8fb26.tar.gz
frameworks_base-5ff571155f0a405d6f7d298c7acaddc84bb8fb26.tar.bz2
am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
* commit 'd0d13d822cdec4fa7214d1495137064c28ecc07e': Update API to contain new wrist tilt sensor type and string.
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/hardware/Sensor.java23
-rw-r--r--core/java/android/hardware/SensorManager.java3
3 files changed, 27 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 5929978..a5a7991 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12713,6 +12713,7 @@ package android.hardware {
field public static final java.lang.String STRING_TYPE_STEP_COUNTER = "android.sensor.step_counter";
field public static final java.lang.String STRING_TYPE_STEP_DETECTOR = "android.sensor.step_detector";
field public static final deprecated java.lang.String STRING_TYPE_TEMPERATURE = "android.sensor.temperature";
+ field public static final java.lang.String STRING_TYPE_WRIST_TILT_GESTURE = "android.sensor.wrist_tilt_gesture";
field public static final int TYPE_ACCELEROMETER = 1; // 0x1
field public static final int TYPE_ALL = -1; // 0xffffffff
field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd
@@ -12735,6 +12736,7 @@ package android.hardware {
field public static final int TYPE_STEP_COUNTER = 19; // 0x13
field public static final int TYPE_STEP_DETECTOR = 18; // 0x12
field public static final deprecated int TYPE_TEMPERATURE = 7; // 0x7
+ field public static final int TYPE_WRIST_TILT_GESTURE = 26; // 0x1a
}
public class SensorEvent {
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java
index cf6a779..fa5e9d2 100644
--- a/core/java/android/hardware/Sensor.java
+++ b/core/java/android/hardware/Sensor.java
@@ -18,6 +18,7 @@
package android.hardware;
import android.os.Build;
+import android.annotation.SystemApi;
/**
* Class representing a sensor. Use {@link SensorManager#getSensorList} to get
@@ -511,6 +512,27 @@ public final class Sensor {
*/
public static final String STRING_TYPE_PICK_UP_GESTURE = "android.sensor.pick_up_gesture";
+ /**
+ * A constant describing a wrist tilt gesture sensor.
+ *
+ * A sensor of this type triggers when the device face is tilted towards the user.
+ * The only allowed return value is 1.0.
+ * This sensor remains active until disabled.
+ *
+ * @hide This sensor is expected to only be used by the system ui
+ */
+ @SystemApi
+ public static final int TYPE_WRIST_TILT_GESTURE = 26;
+
+ /**
+ * A constant string describing a wrist tilt gesture sensor.
+ *
+ * @hide This sensor is expected to only be used by the system ui
+ * @see #TYPE_WRIST_TILT_GESTURE
+ */
+ @SystemApi
+ public static final String STRING_TYPE_WRIST_TILT_GESTURE = "android.sensor.wrist_tilt_gesture";
+
/**
* A constant describing all sensor types.
*/
@@ -591,6 +613,7 @@ public final class Sensor {
1, // SENSOR_TYPE_WAKE_GESTURE
1, // SENSOR_TYPE_GLANCE_GESTURE
1, // SENSOR_TYPE_PICK_UP_GESTURE
+ 1, // SENSOR_TYPE_WRIST_TILT_GESTURE
};
/**
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index e4e5a8c..34b895b 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -451,7 +451,8 @@ public abstract class SensorManager {
// non_wake-up version.
if (type == Sensor.TYPE_PROXIMITY || type == Sensor.TYPE_SIGNIFICANT_MOTION ||
type == Sensor.TYPE_TILT_DETECTOR || type == Sensor.TYPE_WAKE_GESTURE ||
- type == Sensor.TYPE_GLANCE_GESTURE || type == Sensor.TYPE_PICK_UP_GESTURE) {
+ type == Sensor.TYPE_GLANCE_GESTURE || type == Sensor.TYPE_PICK_UP_GESTURE ||
+ type == Sensor.TYPE_WRIST_TILT_GESTURE) {
wakeUpSensor = true;
}