summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-11-19 17:18:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-19 17:18:21 -0800
commit927e7410000dd1917387c01fc4229836ddd5eb97 (patch)
tree34a641dd3cffaea64c471761359a55ef9120b7e5
parent828b68166679ebfc0002e2ea516ca91e6fb13597 (diff)
parentf71384cd6141c50f589178d309db3ceeb848fb30 (diff)
downloadframeworks_base-927e7410000dd1917387c01fc4229836ddd5eb97.zip
frameworks_base-927e7410000dd1917387c01fc4229836ddd5eb97.tar.gz
frameworks_base-927e7410000dd1917387c01fc4229836ddd5eb97.tar.bz2
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
-rw-r--r--core/java/android/hardware/SensorManager.java16
-rw-r--r--docs/html/images/axis_globe_inverted.pngbin0 -> 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
new file mode 100644
index 0000000..bd78c7f
--- /dev/null
+++ b/docs/html/images/axis_globe_inverted.png
Binary files differ