Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 29332971: Merge "Add javadoc for display orientation." into gingerbread

Browse Source 
Merge commit '29332971ddbace4ae3d645a67f28f717df8b1dbd' into gingerbread-plus-aosp

* commit '29332971ddbace4ae3d645a67f28f717df8b1dbd':
  Add javadoc for display orientation.
This commit is contained in:
Wu-cheng Li
2010-10-07 07:18:39 -07:00
committed by Android Git Automerger
parent 841d6ff9e0 29332971dd
commit 9df1408513
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/hardware/Camera.java
View File

@@ -1354,8 +1354,23 @@ public class Camera {
/**
* Sets the dimensions for preview pictures.
*
* The sides of width and height are based on camera orientation. That
* is, the preview size is the size before it is rotated by display
* orientation. So applications need to consider the display orientation
* while setting preview size. For example, suppose the camera supports
* both 480x320 and 320x480 preview sizes. The application wants a 3:2
* preview ratio. If the display orientation is set to 0 or 180, preview
* size should be set to 480x320. If the display orientation is set to
* 90 or 270, preview size should be set to 320x480. The display
* orientation should also be considered while setting picture size and
* thumbnail size.
*
* @param width the width of the pictures, in pixels
* @param height the height of the pictures, in pixels
* @see #setDisplayOrientation(int)
* @see #getCameraInfo(int, CameraInfo)
* @see #setPictureSize(int, int)
* @see #setJpegThumbnailSize(int, int)
*/
public void setPreviewSize(int width, int height) {
String v = Integer.toString(width) + "x" + Integer.toString(height);
@@ -1389,8 +1404,12 @@ public class Camera {
* applications set both width and height to 0, EXIF will not contain
* thumbnail.
*
* Applications need to consider the display orientation. See {@link
* #setPreviewSize(int,int)} for reference.
*
* @param width the width of the thumbnail, in pixels
* @param height the height of the thumbnail, in pixels
* @see #setPreviewSize(int,int)
*/
public void setJpegThumbnailSize(int width, int height) {
set(KEY_JPEG_THUMBNAIL_WIDTH, width);
@@ -1606,8 +1625,13 @@ public class Camera {
/**
* Sets the dimensions for pictures.
*
* Applications need to consider the display orientation. See {@link
* #setPreviewSize(int,int)} for reference.
*
* @param width the width for pictures, in pixels
* @param height the height for pictures, in pixels
* @see #setPreviewSize(int,int)
*
*/
public void setPictureSize(int width, int height) {
String v = Integer.toString(width) + "x" + Integer.toString(height);