From 377456cde5b0c385ea6635a989df68b6f84cc6cb Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Tue, 3 May 2016 11:59:46 -0700
Subject: 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
---
 res/layout/camera_controls.xml       |  1 +
 res/layout/photo_module.xml          |  2 +-
 res/layout/review_module_control.xml | 48 ++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 res/layout/review_module_control.xml

(limited to 'res/layout')

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/review_module_control.xml b/res/layout/review_module_control.xml
new file mode 100644
index 000000000..8280b3101
--- /dev/null
+++ b/res/layout/review_module_control.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.camera.ui.RotatableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/CameraControls"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="2dip">
+    <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" />
+
+    <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"
+        android:scaleType="center"
+        android:focusable="true"
+        android:visibility="gone"
+        android:background="@drawable/bg_pressed"
+        android:src="@drawable/ic_btn_shutter_retake" />
+
+    <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>
-- 
cgit v1.2.3