Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1cefa91 authored by Chih-Chung Chang's avatar Chih-Chung Chang Committed by Android Git Automerger
Browse files

am 724c5224: Correct the setDisplayOrientation sample code.

Merge commit '724c5224' into gingerbread

* commit '724c5224':
  Correct the setDisplayOrientation sample code.
parents 28a6c8e9 724c5224
Loading
Loading
Loading
Loading
+18 −8
Original line number Diff line number Diff line
@@ -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;
     *
     *    int rotation = getWindowManager().getDefaultDisplay().getRotation();
     *    android.hardware.Camera.getCameraInfo(id, cameraInfo);
     *    int degrees = (cameraInfo.mOrientation - rotation + 360) % 360;
     *
     *    setDisplayOrientation(degrees);
     * 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 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