Fix SRI UX issues and improve UI efficiency

Bug: 10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441

3 files changed, 34 insertions, 144 deletions

diff --git a/res/layout-land/pano_module_capture.xml b/res/layout-land/pano_module_capture.xml
deleted file mode 100644
index cb7602629..000000000
--- a/res/layout-land/pano_module_capture.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/panorama_capture_layout"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <!-- The top bar with capture indication -->
-        <FrameLayout style="@style/PanoViewHorizontalBar">
-            <TextView android:id="@+id/pano_capture_indicator"
-                    android:text="@string/pano_capture_indication"
-                    android:textAppearance="?android:textAppearanceMedium"
-                    android:layout_gravity="center"
-                    android:visibility="gone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-        </FrameLayout>
-
-        <FrameLayout
-                android:layout_gravity="center"
-                android:layout_weight="6"
-                android:layout_width="match_parent"
-                android:layout_height="0dp">
-            <TextureView
-                    android:id="@+id/pano_preview_textureview"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-            <View
-                    android:id="@+id/pano_preview_area_border"
-                    android:visibility="gone"
-                    android:background="@drawable/ic_pan_border_fast"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-        </FrameLayout>
-
-        <!-- The bottom bar with progress bar and direction indicators -->
-        <RelativeLayout style="@style/PanoViewHorizontalBar">
-
-            <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_pan_progress_bar"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_centerInParent="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            <ImageView
-                    android:id="@+id/pano_pan_left_indicator"
-                    android:src="@drawable/pano_direction_left_indicator"
-                    android:visibility="gone"
-                    android:layout_marginRight="5dp"
-                    android:layout_toLeftOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
-            <ImageView
-                    android:id="@+id/pano_pan_right_indicator"
-                    android:src="@drawable/pano_direction_right_indicator"
-                    android:visibility="gone"
-                    android:layout_marginLeft="5dp"
-                    android:layout_toRightOf="@id/pano_pan_progress_bar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-    <!-- The hint for "Too fast" text view -->
-    <TextView android:id="@+id/pano_capture_too_fast_textview"
-            android:text="@string/pano_too_fast_prompt"
-            android:textAppearance="?android:textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-</FrameLayout>
diff --git a/res/layout-land/pano_module_review.xml b/res/layout-land/pano_module_review.xml
deleted file mode 100644
index 002d47aff..000000000
--- a/res/layout-land/pano_module_review.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/pano_review_layout"
-        android:visibility="gone"
-        android:orientation="vertical"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent">
-
-    <TextView style="@style/PanoViewHorizontalBar"
-            android:text="@string/pano_review_rendering"
-            android:textAppearance="?android:textAppearanceMedium"
-            android:gravity="center" />
-
-    <ImageView android:id="@+id/pano_reviewarea"
-            android:scaleType="fitCenter"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/pano_mosaic_surface_height" />
-
-    <FrameLayout style="@style/PanoViewHorizontalBar">
-        <com.android.camera.PanoProgressBar
-                android:id="@+id/pano_saving_progress_bar"
-                android:src="@drawable/ic_pan_progression"
-                android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
-
-        <com.android.camera.ui.RotateImageView android:id="@+id/pano_review_cancel_button"
-                style="@style/ReviewControlIcon"
-                android:contentDescription="@string/accessibility_review_cancel"
-                android:layout_gravity="center_vertical|right"
-                android:src="@drawable/ic_menu_cancel_holo_light" />
-    </FrameLayout>
-</LinearLayout>
diff --git a/res/layout-land/pano_review_control.xml b/res/layout-land/pano_review_control.xml
new file mode 100644
index 000000000..93c1020a8
--- /dev/null
+++ b/res/layout-land/pano_review_control.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.android.camera.PanoProgressBar
+        android:id="@+id/pano_saving_progress_bar"
+        android:src="@drawable/ic_pan_progression"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/pano_review_cancel_button"
+        android:scaleType="center"
+        style="@style/ReviewControlIcon"
+        android:contentDescription="@string/accessibility_review_cancel"
+        android:layout_gravity="center_vertical|right"
+        android:src="@drawable/ic_menu_cancel_holo_light" />
+</merge>
\ No newline at end of file