drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am da755ad3: am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.

Browse Source 
Merge commit 'da755ad331aa77fb3780b84c384a27d0217bf410'

* commit 'da755ad331aa77fb3780b84c384a27d0217bf410':
  Correct the setDisplayOrientation sample code.
This commit is contained in:
Chih-Chung Chang
2010-06-14 04:17:59 -07:00
committed by Android Git Automerger
parent d983a25b25 da755ad331
commit a47078a5b0
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,16 +624,26 @@ public class Camera {
* be called during preview.
*
* If you want to make the camera image show in the same orientation as
* the display, you can use <p>
* the display, you can use the following code.<p>
* <pre>
* android.view.Display display;
* android.hardware.Camera.CameraInfo cameraInfo;
* public static void setCameraDisplayOrientation(Activity activity,
* int cameraId, android.hardware.Camera camera) {
* android.hardware.Camera.CameraInfo info =
* new android.hardware.Camera.CameraInfo();
* android.hardware.Camera.getCameraInfo(cameraId, info);
* int rotation = activity.getWindowManager().getDefaultDisplay()
* .getRotation();
* int degrees = 0;
* switch (rotation) {
* case Surface.ROTATION_0: degrees = 0; break;
* case Surface.ROTATION_90: degrees = 90; break;
* case Surface.ROTATION_180: degrees = 180; break;
* case Surface.ROTATION_270: degrees = 270; break;
* }
*
* int rotation = getWindowManager().getDefaultDisplay().getRotation();
* android.hardware.Camera.getCameraInfo(id, cameraInfo);
* int degrees = (cameraInfo.mOrientation - rotation + 360) % 360;
*
* setDisplayOrientation(degrees);
* int result = (info.mOrientation - degrees + 360) % 360;
* camera.setDisplayOrientation(result);
* }
* </pre>
* @param degrees the angle that the picture will be rotated clockwise.
* Valid values are 0, 90, 180, and 270. The starting