summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich2015-09-01 10:58:18 -0500
committerNick Kralevich2015-09-01 10:58:18 -0500
commit335e0e08e9d9c0265e0f171dccf8d9a7790e2218 (patch)
tree85758d8ba15bd38357c07782201e41db1f59b810 /include
parente9a779bf5367ead7ddbd532828d8027a34b4748c (diff)
parent3821feacada79dfd8af1546283a02251e93c9df8 (diff)
downloadframeworks-native-335e0e08e9d9c0265e0f171dccf8d9a7790e2218.tar.gz
frameworks-native-335e0e08e9d9c0265e0f171dccf8d9a7790e2218.tar.xz
frameworks-native-335e0e08e9d9c0265e0f171dccf8d9a7790e2218.zip
resolved conflicts for merge of 3821feac to stage-aosp-master
Change-Id: Icc17d2b7dc26eadf99b2c6967cceaa54ae38e617
Diffstat (limited to 'include')
-rw-r--r--include/android/sensor.h61
1 files changed, 53 insertions, 8 deletions
diff --git a/include/android/sensor.h b/include/android/sensor.h
index 1be623221..3816957bb 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -49,17 +49,62 @@ extern "C" {
49#endif 49#endif
50 50
51 51
52/* 52/**
53 * Sensor types 53 * Sensor types.
54 * (keep in sync with hardware/sensor.h) 54 * (keep in sync with hardware/sensors.h)
55 */ 55 */
56 56
57enum { 57enum {
58 ASENSOR_TYPE_ACCELEROMETER = 1, 58 /**
59 ASENSOR_TYPE_MAGNETIC_FIELD = 2, 59 * {@link ASENSOR_TYPE_ACCELEROMETER}
60 ASENSOR_TYPE_GYROSCOPE = 4, 60 * reporting-mode: continuous
61 ASENSOR_TYPE_LIGHT = 5, 61 *
62 ASENSOR_TYPE_PROXIMITY = 8 62 * All values are in SI units (m/s^2) and measure the acceleration of the
63 * device including the force of gravity.
64 */
65 ASENSOR_TYPE_ACCELEROMETER = 1,
66 /**
67 * {@link ASENSOR_TYPE_MAGNETIC_FIELD}
68 * reporting-mode: continuous
69 *
70 * All values are in micro-Tesla (uT) and measure the geomagnetic
71 * field in the X, Y and Z axis.
72 */
73 ASENSOR_TYPE_MAGNETIC_FIELD = 2,
74 /**
75 * {@link ASENSOR_TYPE_GYROSCOPE}
76 * reporting-mode: continuous
77 *
78 * All values are in radians/second and measure the rate of rotation
79 * around the X, Y and Z axis.
80 */
81 ASENSOR_TYPE_GYROSCOPE = 4,
82 /**
83 * {@link ASENSOR_TYPE_LIGHT}
84 * reporting-mode: on-change
85 *
86 * The light sensor value is returned in SI lux units.
87 */
88 ASENSOR_TYPE_LIGHT = 5,
89 /**
90 * {@link ASENSOR_TYPE_PROXIMITY}
91 * reporting-mode: on-change
92 *
93 * The proximity sensor which turns the screen off and back on during calls is the
94 * wake-up proximity sensor. Implement wake-up proximity sensor before implementing
95 * a non wake-up proximity sensor. For the wake-up proximity sensor set the flag
96 * SENSOR_FLAG_WAKE_UP.
97 * The value corresponds to the distance to the nearest object in centimeters.
98 */
99 ASENSOR_TYPE_PROXIMITY = 8,
100 /**
101 * {@link ASENSOR_TYPE_LINEAR_ACCELERATION}
102 * reporting-mode: continuous
103 *
104 * All values are in SI units (m/s^2) and measure the acceleration of the
105 * device not including the force of gravity.
106 */
107 ASENSOR_TYPE_LINEAR_ACCELERATION = 10
63}; 108};
64 109
65/* 110/*