diff options
| author | Igor Murashkin <iam@google.com> | 2013-06-11 15:25:20 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-06-11 15:25:20 -0700 |
| commit | a1b02dbb6edf0644720716d3f271b1ee091aa2d6 (patch) | |
| tree | 4f0927a989d9a6d22fb8433ea6d7ff14f6e09b79 /core/java/android/hardware/Camera.java | |
| parent | cf88be6dc843d972c98ff100430b16aa22c60516 (diff) | |
| download | frameworks_base-a1b02dbb6edf0644720716d3f271b1ee091aa2d6.zip frameworks_base-a1b02dbb6edf0644720716d3f271b1ee091aa2d6.tar.gz frameworks_base-a1b02dbb6edf0644720716d3f271b1ee091aa2d6.tar.bz2 | |
Fix build break due to javadoc linking error
Change-Id: I9da1cb03afef25c11844ec863200f7b5b009e77a
Diffstat (limited to 'core/java/android/hardware/Camera.java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index ac42b76..feb47aa 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -2769,21 +2769,24 @@ public class Camera { * JPEG {@link PictureCallback}. The camera driver may set orientation * in the EXIF header without rotating the picture. Or the driver may * rotate the picture and the EXIF thumbnail. If the Jpeg picture is - * rotated, the orientation in the EXIF header will be missing or 1 - * (row #0 is top and column #0 is left side). - * - * <p>If applications want to rotate the picture to match the orientation - * of what users see, apps should use {@link - * android.view.OrientationEventListener} and {@link CameraInfo}. - * The value from OrientationEventListener is relative to the natural - * orientation of the device. CameraInfo.orientation is the angle - * between camera orientation and natural device orientation. The sum - * of the two is the rotation angle for back-facing camera. The - * difference of the two is the rotation angle for front-facing camera. - * Note that the JPEG pictures of front-facing cameras are not mirrored - * as in preview display. - * - * <p>For example, suppose the natural orientation of the device is + * rotated, the orientation in the EXIF header will be missing or 1 (row + * #0 is top and column #0 is left side). + * + * <p> + * If applications want to rotate the picture to match the orientation + * of what users see, apps should use + * {@link android.view.OrientationEventListener} and + * {@link android.hardware.Camera.CameraInfo}. The value from + * OrientationEventListener is relative to the natural orientation of + * the device. CameraInfo.orientation is the angle between camera + * orientation and natural device orientation. The sum of the two is the + * rotation angle for back-facing camera. The difference of the two is + * the rotation angle for front-facing camera. Note that the JPEG + * pictures of front-facing cameras are not mirrored as in preview + * display. + * + * <p> + * For example, suppose the natural orientation of the device is * portrait. The device is rotated 270 degrees clockwise, so the device * orientation is 270. Suppose a back-facing camera sensor is mounted in * landscape and the top side of the camera sensor is aligned with the |