diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 17:16:37 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 17:16:37 -0700 |
| commit | 0460e26a4c9915f77c915d2cc3540969802b02fa (patch) | |
| tree | 07e81d722979a30813b646b54ac17c56a4b20952 /core/java/android/hardware/Sensor.java | |
| parent | d90348796829f3d3a443e73ea3b3f2f9e79071c2 (diff) | |
| parent | 691be97f1640e52b99ce9905fe854f27eeeed62c (diff) | |
| download | frameworks_base-0460e26a4c9915f77c915d2cc3540969802b02fa.zip frameworks_base-0460e26a4c9915f77c915d2cc3540969802b02fa.tar.gz frameworks_base-0460e26a4c9915f77c915d2cc3540969802b02fa.tar.bz2 | |
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124
Diffstat (limited to 'core/java/android/hardware/Sensor.java')
| -rw-r--r-- | core/java/android/hardware/Sensor.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index b49a409..f2b907b 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -77,6 +77,27 @@ public class Sensor { public static final int TYPE_PROXIMITY = 8; /** + * A constant describing a gravity sensor type. + * See {@link android.hardware.SensorEvent SensorEvent} + * for more details. + */ + public static final int TYPE_GRAVITY = 9; + + /** + * A constant describing a linear acceleration sensor type. + * See {@link android.hardware.SensorEvent SensorEvent} + * for more details. + */ + public static final int TYPE_LINEAR_ACCELERATION = 10; + + /** + * A constant describing a rotation vector sensor type. + * See {@link android.hardware.SensorEvent SensorEvent} + * for more details. + */ + public static final int TYPE_ROTATION_VECTOR = 11; + + /** * A constant describing all sensor types. */ public static final int TYPE_ALL = -1; |