diff options
author | Doris Liu <tianliu@google.com> | 2013-10-19 00:39:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-19 00:39:54 +0000 |
commit | 891a80756166a8621f063c727000c9a943cf5465 (patch) | |
tree | 26a03bc93e07aeaafd95aa3a97352fb6f3d32289 | |
parent | 464f22013750a416f9fc9a1e32007576d0b655d6 (diff) | |
parent | 209a165bd776c938cad388fcf0b1ed27eef4ed83 (diff) | |
download | android_packages_apps_Snap-891a80756166a8621f063c727000c9a943cf5465.tar.gz android_packages_apps_Snap-891a80756166a8621f063c727000c9a943cf5465.tar.bz2 android_packages_apps_Snap-891a80756166a8621f063c727000c9a943cf5465.zip |
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaController.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 7 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 9 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaController.java b/src/com/android/camera/WideAnglePanoramaController.java index 6ac7c511d..d711c0942 100644 --- a/src/com/android/camera/WideAnglePanoramaController.java +++ b/src/com/android/camera/WideAnglePanoramaController.java @@ -30,4 +30,6 @@ public interface WideAnglePanoramaController { public void onShutterButtonClick(); public void onPreviewUILayoutChange(int l, int t, int r, int b); + + public int getCameraOrientation(); } diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index db4e59d2e..320b96086 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -647,6 +647,13 @@ public class WideAnglePanoramaModule return orientation; } + /** The orientation of the camera image. The value is the angle that the camera + * image needs to be rotated clockwise so it shows correctly on the display + * in its natural orientation. It should be 0, 90, 180, or 270.*/ + public int getCameraOrientation() { + return mCameraOrientation; + } + public void saveHighResMosaic() { runBackgroundThread(new Thread() { @Override diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index b0f3de40b..1546958de 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -434,8 +434,13 @@ public class WideAnglePanoramaUI implements } public void flipPreviewIfNeeded() { - if (CameraUtil.getDisplayRotation(mActivity) >= 180) { - // In either reverse landscape or reverse portrait + // Rotation needed to display image correctly clockwise + int cameraOrientation = mController.getCameraOrientation(); + // Display rotated counter-clockwise + int displayRotation = CameraUtil.getDisplayRotation(mActivity); + // Rotation needed to display image correctly on current display + int rotation = (cameraOrientation - displayRotation + 360) % 360; + if (rotation >= 180) { mTextureView.setRotation(180); } else { mTextureView.setRotation(0); |