diff options
author | Dirk Dougherty <ddougherty@google.com> | 2010-10-20 09:34:24 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-20 09:34:24 -0700 |
commit | 3466e1fc6db1fed35e2707c67a9ab17673aaf9de (patch) | |
tree | aa9600a6e125b6ad23423e3df4bb78cba757a239 /core/java/android/hardware | |
parent | b595e094e3901ff8a224eaf7d4869e7d2e5649dd (diff) | |
parent | 75ceb8d9dbf60943a048098075091bc1e835f1ee (diff) | |
download | frameworks_base-3466e1fc6db1fed35e2707c67a9ab17673aaf9de.zip frameworks_base-3466e1fc6db1fed35e2707c67a9ab17673aaf9de.tar.gz frameworks_base-3466e1fc6db1fed35e2707c67a9ab17673aaf9de.tar.bz2 |
Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r-- | core/java/android/hardware/SensorEvent.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/SensorEvent.java b/core/java/android/hardware/SensorEvent.java index 2c5c909..98bf632 100644 --- a/core/java/android/hardware/SensorEvent.java +++ b/core/java/android/hardware/SensorEvent.java @@ -177,12 +177,12 @@ public class SensorEvent { * <h4>{@link android.hardware.Sensor#TYPE_ROTATION_VECTOR Sensor.TYPE_ROTATION_VECTOR}:</h4> * The rotation vector represents the orientation of the device as a combination of an angle * and an axis, in which the device has rotated through an angle theta around an axis - * <x, y, z>. The three elements of the rotation vector are - * <x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation + * <x, y, z>. The three elements of the rotation vector are + * <x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation * vector is equal to sin(theta/2), and the direction of the rotation vector is equal to the * direction of the axis of rotation. The three elements of the rotation vector are equal to * the last three components of a unit quaternion - * <cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>. Elements of the rotation + * <cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>. Elements of the rotation * vector are unitless. The x,y, and z axis are defined in the same way as the acceleration * sensor. * |