Merge 17b1263029655fee3611f92993ae864d8acd1d1d on remote branch

Change-Id: I0a3817609dff98fec486666e2b63686c075f1ae3

3 files changed, 14 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index d2e2345e6..e5f23a869 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1304,6 +1304,9 @@ public class PhotoUI implements PieListener,
         if (mFaceView != null) {
             mFaceView.setDisplayRotation(orientation);
         }
+        if (mZoomRenderer != null) {
+            mZoomRenderer.setOrientation(orientation);
+        }
     }
 
     public int getOrientation() {
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 8fbae5ee6..58ab45a43 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -1135,6 +1135,9 @@ public class VideoUI implements PieRenderer.PieListener,
                 }
             }
         }
+        if (mZoomRenderer != null) {
+            mZoomRenderer.setOrientation(orientation);
+        }
         RotateTextToast.setOrientation(orientation);
         mOrientation = orientation;
     }
diff --git a/src/com/android/camera/ui/ZoomRenderer.java b/src/com/android/camera/ui/ZoomRenderer.java
index c1f4c6c98..9943b1c8d 100644
--- a/src/com/android/camera/ui/ZoomRenderer.java
+++ b/src/com/android/camera/ui/ZoomRenderer.java
@@ -48,6 +48,7 @@ public class ZoomRenderer extends OverlayRenderer
     private int mZoomSig;
     private int mZoomFraction;
     private Rect mTextBounds;
+    private int mOrientation;
 
     public interface OnZoomChangedListener {
         void onZoomStart();
@@ -109,6 +110,7 @@ public class ZoomRenderer extends OverlayRenderer
 
     @Override
     public void onDraw(Canvas canvas) {
+        canvas.rotate(mOrientation, mCenterX, mCenterY);
         mPaint.setStrokeWidth(mInnerStroke);
         canvas.drawCircle(mCenterX, mCenterY, mMinCircle, mPaint);
         canvas.drawCircle(mCenterX, mCenterY, mMaxCircle, mPaint);
@@ -155,4 +157,10 @@ public class ZoomRenderer extends OverlayRenderer
         }
     }
 
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+        if (mOrientation == 90) mOrientation = 270;
+        else if (mOrientation == 270) mOrientation = 90;
+    }
+
 }