Make photo orientation consistent with UI

Also fixed the wrong animation orientation.

Bug: 7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5

1 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 60cb67896..33ebcd931 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1133,7 +1133,15 @@ public class PhotoModule
         }
 
         // Set rotation and gps data.
-        mJpegRotation = Util.getJpegRotation(mCameraId, mOrientation);
+        int orientation;
+        // We need to be consistent with the framework orientation (i.e. the
+        // orientation of the UI.) when the auto-rotate screen setting is on.
+        if (mActivity.isAutoRotateScreen()) {
+            orientation = (360 - mDisplayRotation) % 360;
+        } else {
+            orientation = mOrientation;
+        }
+        mJpegRotation = Util.getJpegRotation(mCameraId, orientation);
         mParameters.setRotation(mJpegRotation);
         Location loc = mLocationManager.getCurrentLocation();
         Util.setGpsParameters(mParameters, loc);