diff options
| author | Mathias Agopian <mathias@google.com> | 2010-11-19 17:20:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 17:20:14 -0800 |
| commit | d3b5510b8505c6c653469193a40f6431272085f3 (patch) | |
| tree | c5fbd5efd178caaf54ec566a41472486977e102a | |
| parent | 55ff5708bb166ab985ffd89e62ddcb13927d6403 (diff) | |
| parent | 927e7410000dd1917387c01fc4229836ddd5eb97 (diff) | |
| download | frameworks_base-d3b5510b8505c6c653469193a40f6431272085f3.zip frameworks_base-d3b5510b8505c6c653469193a40f6431272085f3.tar.gz frameworks_base-d3b5510b8505c6c653469193a40f6431272085f3.tar.bz2 | |
am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
| -rw-r--r-- | core/java/android/hardware/SensorManager.java | 16 | ||||
| -rw-r--r-- | docs/html/images/axis_globe_inverted.png | bin | 0 -> 6296 bytes |
2 files changed, 13 insertions, 3 deletions
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 3f6e4ce..c178aee 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -1158,7 +1158,7 @@ public class SensorManager * * <p> * <center><img src="../../../images/axis_globe.png" - * alt="Sensors coordinate-system diagram." border="0" /></center> + * alt="World coordinate-system diagram." border="0" /></center> * </p> * * <p> @@ -1521,9 +1521,19 @@ public class SensorManager * <li>values[1]: <i>pitch</i>, rotation around the X axis.</li> * <li>values[2]: <i>roll</i>, rotation around the Y axis.</li> * </ul> + * <p>The reference coordinate-system used is different from the world + * coordinate-system defined for the rotation matrix:</p> + * <ul> + * <li>X is defined as the vector product <b>Y.Z</b> (It is tangential to + * the ground at the device's current location and roughly points West).</li> + * <li>Y is tangential to the ground at the device's current location and + * points towards the magnetic North Pole.</li> + * <li>Z points towards the center of the Earth and is perpendicular to the ground.</li> + * </ul> + * * <p> - * <center><img src="../../../images/axis_device.png" - * alt="Sensors coordinate-system diagram." border="0" /></center> + * <center><img src="../../../images/axis_device_inverted.png" + * alt="Inverted world coordinate-system diagram." border="0" /></center> * </p> * <p> * All three angles above are in <b>radians</b> and <b>positive</b> in the diff --git a/docs/html/images/axis_globe_inverted.png b/docs/html/images/axis_globe_inverted.png Binary files differnew file mode 100644 index 0000000..bd78c7f --- /dev/null +++ b/docs/html/images/axis_globe_inverted.png |
