summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaUI.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-10-18 17:15:30 -0700
committerDoris Liu <tianliu@google.com>2013-10-18 17:15:30 -0700
commit209a165bd776c938cad388fcf0b1ed27eef4ed83 (patch)
tree4c7465d2a317abd2fca4bd322bda8dd7f7d19105 /src/com/android/camera/WideAnglePanoramaUI.java
parent8470cae9049959ee6bb28cde1c53185f2ffd10a1 (diff)
downloadandroid_packages_apps_Snap-209a165bd776c938cad388fcf0b1ed27eef4ed83.tar.gz
android_packages_apps_Snap-209a165bd776c938cad388fcf0b1ed27eef4ed83.tar.bz2
android_packages_apps_Snap-209a165bd776c938cad388fcf0b1ed27eef4ed83.zip
Fix SRI orientation on manta
Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaUI.java')
-rw-r--r--src/com/android/camera/WideAnglePanoramaUI.java9
1 files changed, 7 insertions, 2 deletions
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);