diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2015-02-11 00:39:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-11 00:39:14 +0000 |
| commit | 668ebe950143c76936685378fb0ae9b682ab24f5 (patch) | |
| tree | c743978d5615c25989f07ffbdb6b2e11987e4afa /api | |
| parent | 9408ce362e6c01656f280696af3aabd190d53356 (diff) | |
| parent | 5ff571155f0a405d6f7d298c7acaddc84bb8fb26 (diff) | |
| download | frameworks_base-668ebe950143c76936685378fb0ae9b682ab24f5.zip frameworks_base-668ebe950143c76936685378fb0ae9b682ab24f5.tar.gz frameworks_base-668ebe950143c76936685378fb0ae9b682ab24f5.tar.bz2 | |
am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev
automerge: 5ff5711
* commit '5ff571155f0a405d6f7d298c7acaddc84bb8fb26':
Update API to contain new wrist tilt sensor type and string.
Diffstat (limited to 'api')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 7dfa8f4..ce68ca9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -12819,6 +12819,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 @@ -12841,6 +12842,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 { |