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

am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread

Browse Source 
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp

* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
  Update camera API and javadoc for API review comments.
This commit is contained in:
Wu-cheng Li
2010-09-15 15:01:09 -07:00
committed by Android Git Automerger
parent 0cd2472bf8 a6f4149596
commit 4db458b4f7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

@@ -77416,7 +77416,7 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="mFacing" <field name="facing"
type="int" type="int"
transient="false" transient="false"
volatile="false" volatile="false"
@@ -77426,7 +77426,7 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="mOrientation" <field name="orientation"
type="int" type="int"
transient="false" transient="false"
volatile="false" volatile="false"

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

@@ -154,14 +154,21 @@ public class Camera {
* Information about a camera * Information about a camera
*/ */
public static class CameraInfo { public static class CameraInfo {
/**
* The facing of the camera is opposite to that of the screen.
*/
public static final int CAMERA_FACING_BACK = 0; public static final int CAMERA_FACING_BACK = 0;
/**
* The facing of the camera is the same as that of the screen.
*/
public static final int CAMERA_FACING_FRONT = 1; public static final int CAMERA_FACING_FRONT = 1;
/** /**
* The direction that the camera faces to. It should be * The direction that the camera faces to. It should be
* CAMERA_FACING_BACK or CAMERA_FACING_FRONT. * CAMERA_FACING_BACK or CAMERA_FACING_FRONT.
*/ */
public int mFacing; public int facing;
/** /**
* The orientation of the camera image. The value is the angle that the * The orientation of the camera image. The value is the angle that the
@@ -175,7 +182,7 @@ public class Camera {
* *
* @see #setDisplayOrientation(int) * @see #setDisplayOrientation(int)
*/ */
public int mOrientation; public int orientation;
}; };
/** /**
@@ -210,12 +217,14 @@ public class Camera {
/** /**
* The id for the default camera. * The id for the default camera.
* @see #open(int)
*/ */
public static int CAMERA_ID_DEFAULT = 0; public static int CAMERA_ID_DEFAULT = 0;
/** /**
* Equivalent to Camera.open(Camera.CAMERA_ID_DEFAULT). * Equivalent to Camera.open(Camera.CAMERA_ID_DEFAULT).
* Creates a new Camera object to access the default camera. * Creates a new Camera object to access the default camera.
* @see #open(int)
*/ */
public static Camera open() { public static Camera open() {
return new Camera(CAMERA_ID_DEFAULT); return new Camera(CAMERA_ID_DEFAULT);
@@ -787,7 +796,7 @@ public class Camera {
* case Surface.ROTATION_270: degrees = 270; break; * case Surface.ROTATION_270: degrees = 270; break;
* } * }
* *
* int result = (info.mOrientation - degrees + 360) % 360; * int result = (info.orientation - degrees + 360) % 360;
* camera.setDisplayOrientation(result); * camera.setDisplayOrientation(result);
* } * }
* </pre> * </pre>