Merge 559a4151 from gingerbread-plus-aosp

Change-Id: I8ec4aa5210cb5104bedb7d5ed6f823f44517b203

2 files changed, 20 insertions, 12 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index ebffe30..b626079 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -903,16 +903,16 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
         private void capture() {
             mCaptureOnlyData = null;
 
-            // Set JPEG rotation to match the orientation of what users see. The
-            // rotation is relative to the orientation of the camera. The value
-            // from OrientationEventListener is relative to the natural
-            // orientation of the device. CameraInfo.mOrientation is the angle
-            // between camera orientation and natural device orientation. The
-            // sum of the two is the value for setRotation.
+            // See android.hardware.Camera.Parameters.setRotation for
+            // documentation.
             int rotation = 0;
             if (mOrientation != OrientationEventListener.ORIENTATION_UNKNOWN) {
                 CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
-                rotation = (mOrientation + info.orientation) % 360;
+                if (info.facing == CameraInfo.CAMERA_FACING_FRONT) {
+                    rotation = (info.orientation - mOrientation + 360) % 360;
+                } else {  // back-facing camera
+                    rotation = (info.orientation + mOrientation) % 360;
+                }
             }
             mParameters.setRotation(rotation);
 
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 2bff219..71d0c21 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -24,6 +24,7 @@ import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
+import android.hardware.Camera;
 import android.hardware.Camera.Size;
 import android.util.Log;
 import android.view.Display;
@@ -295,12 +296,19 @@ public class Util {
     }
 
     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 cameraId, Camera camera) {
+        // See android.hardware.Camera.setCameraDisplayOrientation for
+        // documentation.
+        Camera.CameraInfo info = new Camera.CameraInfo();
+        Camera.getCameraInfo(cameraId, info);
         int degrees = getDisplayRotation(activity);
-        int result = (info.orientation - degrees + 360) % 360;
+        int result;
+        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+            result = (info.orientation + degrees) % 360;
+            result = (360 - result) % 360;  // compensate the mirror
+        } else {  // back-facing
+            result = (info.orientation - degrees + 360) % 360;
+        }
         camera.setDisplayOrientation(result);
     }