SnapdragonCamera: Support rotation for image review layout

Currently, image review layout is fixed to portrait mode.
Changing the resources to use RotateImageView and update
the scaling function in RotateImageView to support both
up and down scaling of the image

CRs-Fixed: 1004669
Change-Id: I6940227c634b7654bce5de5efe032aaa8da80e72

3 files changed, 19 insertions, 18 deletions

diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 66519d41c..c1def502f 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -50,6 +50,7 @@
         style="@style/SwitcherButton"
         android:layout_gravity="bottom|left"
         android:layout_marginBottom="2dip"
+        android:scaleType="center"
         android:contentDescription="@string/accessibility_mode_picker" />
 
     <com.android.camera.ShutterButton
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 9c5b2c0d0..2e3fb8aa0 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -68,7 +68,7 @@
             android:layout_marginTop="50dip"
             android:layout_marginLeft="15dip" />
     </RelativeLayout>
-    <ImageView
+    <com.android.camera.ui.RotateImageView
         android:id="@+id/review_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout-port/review_module_control.xml b/res/layout/review_module_control.xml
index 3c4280ed2..8280b3101 100644
--- a/res/layout-port/review_module_control.xml
+++ b/res/layout/review_module_control.xml
@@ -18,16 +18,16 @@
         style="@style/CameraControls"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="2dip">
-    <ImageView android:id="@+id/btn_done"
-            style="@style/ReviewControlIcon"
-            android:contentDescription="@string/accessibility_review_ok"
-            android:visibility="gone"
-            android:scaleType="center"
-            android:layout_gravity="right|bottom"
-            android:background="@drawable/bg_pressed"
-            android:src="@drawable/ic_menu_done_holo_light" />
+    <com.android.camera.ui.RotateImageView android:id="@+id/btn_done"
+        style="@style/ReviewControlIcon"
+        android:contentDescription="@string/accessibility_review_ok"
+        android:visibility="gone"
+        android:scaleType="center"
+        android:layout_gravity="right|bottom"
+        android:background="@drawable/bg_pressed"
+        android:src="@drawable/ic_menu_done_holo_light" />
 
-    <ImageView android:id="@+id/btn_retake"
+    <com.android.camera.ui.RotateImageView android:id="@+id/btn_retake"
         style="@style/ReviewControlIcon"
         android:contentDescription="@string/accessibility_review_retake"
         android:layout_gravity="bottom|center_horizontal"
@@ -37,12 +37,12 @@
         android:background="@drawable/bg_pressed"
         android:src="@drawable/ic_btn_shutter_retake" />
 
-    <ImageView android:id="@+id/btn_cancel"
-            style="@style/ReviewControlIcon"
-            android:contentDescription="@string/accessibility_review_cancel"
-            android:visibility="gone"
-            android:scaleType="center"
-            android:layout_gravity="left|bottom"
-            android:background="@drawable/bg_pressed"
-            android:src="@drawable/ic_menu_cancel_holo_light" />
+    <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel"
+        style="@style/ReviewControlIcon"
+        android:contentDescription="@string/accessibility_review_cancel"
+        android:visibility="gone"
+        android:scaleType="center"
+        android:layout_gravity="left|bottom"
+        android:background="@drawable/bg_pressed"
+        android:src="@drawable/ic_menu_cancel_holo_light" />
 </com.android.camera.ui.RotatableLayout>