diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2015-02-11 20:04:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 20:04:42 +0000 |
| commit | 26cc3d0b67ff4daf31eaeed0ecd87b391978aadb (patch) | |
| tree | 787f857af603ea13644db685c2890b0c4e3428eb /libs/gui | |
| parent | 459c0b6d3693c6e7f29c538300cc78f64b8c318b (diff) | |
| parent | b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b (diff) | |
| download | frameworks_native-26cc3d0b67ff4daf31eaeed0ecd87b391978aadb.zip frameworks_native-26cc3d0b67ff4daf31eaeed0ecd87b391978aadb.tar.gz frameworks_native-26cc3d0b67ff4daf31eaeed0ecd87b391978aadb.tar.bz2 | |
am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
* commit 'b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/Sensor.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index b4291bb..41a45fc 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -204,6 +204,13 @@ Sensor::Sensor(struct sensor_t const* hwSensor, int halVersion) mFlags |= SENSOR_FLAG_WAKE_UP; } break; + case SENSOR_TYPE_WRIST_TILT_GESTURE: + mStringType = SENSOR_STRING_TYPE_WRIST_TILT_GESTURE; + mFlags |= SENSOR_FLAG_SPECIAL_REPORTING_MODE; + if (halVersion < SENSORS_DEVICE_API_VERSION_1_3) { + mFlags |= SENSOR_FLAG_WAKE_UP; + } + break; default: // Only pipe the stringType, requiredPermission and flags for custom sensors. if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor->stringType) { |