From 105aaf4dd5a381d4c5098fc1d7ace29a3c240c9e Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 23 Sep 2013 20:43:20 -0700
Subject: Fix SRI UX issues and improve UI efficiency

Bug: 10674078
Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
---
 res/layout-land/pano_module_capture.xml         |  96 -------------------
 res/layout-land/pano_module_review.xml          |  48 ----------
 res/layout-land/pano_review_control.xml         |  34 +++++++
 res/layout-port/pano_module_capture.xml         |  96 -------------------
 res/layout-port/pano_module_review.xml          |  60 ------------
 res/layout-port/pano_review_control.xml         |  33 +++++++
 res/layout/pano_module_capture.xml              | 119 ++++++++++++++++++++++++
 res/layout/pano_module_review.xml               |  50 ++++++++++
 res/values-land/dimensions.xml                  |   1 +
 res/values-port/dimensions.xml                  |  18 ++++
 res/values/styles.xml                           |   3 -
 src/com/android/camera/WideAnglePanoramaUI.java |  73 +++++++++------
 12 files changed, 300 insertions(+), 331 deletions(-)
 delete mode 100644 res/layout-land/pano_module_capture.xml
 delete mode 100644 res/layout-land/pano_module_review.xml
 create mode 100644 res/layout-land/pano_review_control.xml
 delete mode 100644 res/layout-port/pano_module_capture.xml
 delete mode 100644 res/layout-port/pano_module_review.xml
 create mode 100644 res/layout-port/pano_review_control.xml
 create mode 100644 res/layout/pano_module_capture.xml
 create mode 100644 res/layout/pano_module_review.xml
 create mode 100644 res/values-port/dimensions.xml

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
diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml
deleted file mode 100644
index 57c00cded..000000000
--- a/res/layout-port/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="3"
-            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-port/pano_module_review.xml b/res/layout-port/pano_module_review.xml
deleted file mode 100644
index 3c5eb2cfc..000000000
--- a/res/layout-port/pano_module_review.xml
+++ /dev/null
@@ -1,60 +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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/pano_review_layout"
-        android:visibility="gone"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent">
-
-    <LinearLayout
-            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="0dp"
-                   android:layout_weight="1.5" />
-
-        <View style="@style/PanoViewHorizontalBar"/>
-    </LinearLayout>
-
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_horizontal|bottom">
-
-        <com.android.camera.PanoProgressBar
-                android:id="@+id/pano_saving_progress_bar"
-                android:src="@drawable/ic_pan_progression"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
-
-        <ImageView android:id="@id/pano_review_cancel_button"
-                style="@style/ReviewControlIcon"
-                android:contentDescription="@string/accessibility_review_cancel"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/ic_menu_cancel_holo_light" />
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout-port/pano_review_control.xml b/res/layout-port/pano_review_control.xml
new file mode 100644
index 000000000..852b486ad
--- /dev/null
+++ b/res/layout-port/pano_review_control.xml
@@ -0,0 +1,33 @@
+<?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_horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content" />
+
+    <ImageView android:id="@id/pano_review_cancel_button"
+        android:scaleType="center"
+        style="@style/ReviewControlIcon"
+        android:contentDescription="@string/accessibility_review_cancel"
+        android:layout_gravity="center_horizontal|bottom"
+        android:src="@drawable/ic_menu_cancel_holo_light" />
+</merge>
\ No newline at end of file
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
new file mode 100644
index 000000000..c6c131741
--- /dev/null
+++ b/res/layout/pano_module_capture.xml
@@ -0,0 +1,119 @@
+<?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"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <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:id="@+id/pano_preview_layout"
+            android:layout_weight="@integer/SRI_pano_layout_weight"
+            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 -->
+        <FrameLayout
+            style="@style/PanoViewHorizontalBar"
+            android:paddingTop="20dp"
+            android:gravity="top"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <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>
+        </FrameLayout>
+
+
+    </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/pano_module_review.xml b/res/layout/pano_module_review.xml
new file mode 100644
index 000000000..3f80e8af0
--- /dev/null
+++ b/res/layout/pano_module_review.xml
@@ -0,0 +1,50 @@
+<?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:orientation="vertical"
+    android:visibility="gone"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <TextView
+        style="@style/PanoViewHorizontalBar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        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="0dp"
+        android:layout_weight="@integer/SRI_pano_layout_weight" />
+
+    <FrameLayout
+        android:id="@+id/pano_review_control"
+        style="@style/PanoViewHorizontalBar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <include layout="@layout/pano_review_control" />
+    </FrameLayout>
+</LinearLayout>
+
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index 3eae85647..41eea19ed 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -17,4 +17,5 @@
     <!-- for manage cache bar -->
     <dimen name="manage_cache_bottom_height">39dp</dimen>
     <dimen name="capture_top_margin">0dip</dimen>
+    <integer name="SRI_pano_layout_weight">3</integer>
 </resources>
diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml
new file mode 100644
index 000000000..6f3fe7636
--- /dev/null
+++ b/res/values-port/dimensions.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<resources>
+    <integer name="SRI_pano_layout_weight">2</integer>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a09bce73f..0d6241588 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -275,8 +275,5 @@
     <style name="PanoViewHorizontalBar">
         <item name="android:background">#000000</item>
         <item name="android:alpha">1.0</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0dp</item>
-        <item name="android:layout_weight">1.5</item>
     </style>
 </resources>
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 7c846468e..407160933 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -37,6 +37,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.camera.ui.CameraControls;
@@ -71,6 +72,8 @@ public class WideAnglePanoramaUI implements
     private PanoProgressBar mCaptureProgressBar;
     private PanoProgressBar mSavingProgressBar;
     private TextView mTooFastPrompt;
+    private View mPreviewLayout;
+    private ViewGroup mReviewControl;
     private TextureView mTextureView;
     private ShutterButton mShutterButton;
     private CameraControls mCameraControls;
@@ -265,14 +268,11 @@ public class WideAnglePanoramaUI implements
         if (threadRunning) lowResReview = mReview.getDrawable();
 
         // Change layout in response to configuration change
-        /* TODO (shkong):mCaptureLayout.setOrientation(
-                newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
-                        ? LinearLayout.HORIZONTAL : LinearLayout.VERTICAL);*/
         LayoutInflater inflater = (LayoutInflater)
                 mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-        mPanoLayout.removeView(mReviewLayout);
-        inflater.inflate(R.layout.pano_module_review, mPanoLayout);
+        mReviewControl.removeAllViews();
+        inflater.inflate(R.layout.pano_review_control, mReviewControl, true);
 
         mPanoLayout.bringChildToFront(mCameraControls);
         setViews(mActivity.getResources());
@@ -324,25 +324,21 @@ public class WideAnglePanoramaUI implements
     }
 
     private void createContentView() {
-        LayoutInflater inflator = (LayoutInflater) mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        LayoutInflater inflator = (LayoutInflater) mActivity
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         inflator.inflate(R.layout.panorama_module, mRootView, true);
-        mPanoLayout = (ViewGroup) mRootView.findViewById(R.id.pano_layout);
+
         Resources appRes = mActivity.getResources();
         mIndicatorColor = appRes.getColor(R.color.pano_progress_indication);
         mReviewBackground = appRes.getColor(R.color.review_background);
         mIndicatorColorFast = appRes.getColor(R.color.pano_progress_indication_fast);
-        mDialogHelper = new DialogHelper();
-        setViews(appRes);
-    }
 
-    private void setViews(Resources appRes) {
+        mPanoLayout = (ViewGroup) mRootView.findViewById(R.id.pano_layout);
+        mPreviewLayout = mRootView.findViewById(R.id.pano_preview_layout);
+        mReviewControl = (ViewGroup) mRootView.findViewById(R.id.pano_review_control);
+        mReviewLayout = mRootView.findViewById(R.id.pano_review_layout);
+        mReview = (ImageView) mRootView.findViewById(R.id.pano_reviewarea);
         mCaptureLayout = (FrameLayout) mRootView.findViewById(R.id.panorama_capture_layout);
-        // TODO (shkong): set display change listener properly.
-        ((CameraRootView) mRootView).setDisplayChangeListener(null);
-        mTextureView = (TextureView) mRootView.findViewById(R.id.pano_preview_textureview);
-        mTextureView.setSurfaceTextureListener(this);
-        mTextureView.addOnLayoutChangeListener(this);
-        mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
         mCaptureProgressBar = (PanoProgressBar) mRootView.findViewById(R.id.pano_pan_progress_bar);
         mCaptureProgressBar.setBackgroundColor(appRes.getColor(R.color.pano_progress_empty));
         mCaptureProgressBar.setDoneColor(appRes.getColor(R.color.pano_progress_done));
@@ -356,6 +352,37 @@ public class WideAnglePanoramaUI implements
         mLeftIndicator.setEnabled(false);
         mRightIndicator.setEnabled(false);
         mTooFastPrompt = (TextView) mRootView.findViewById(R.id.pano_capture_too_fast_textview);
+        mCaptureIndicator = mRootView.findViewById(R.id.pano_capture_indicator);
+
+        mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button);
+        mShutterButton.setImageResource(R.drawable.btn_new_shutter);
+        mShutterButton.setOnShutterButtonListener(this);
+        // Hide menu and indicators.
+        mRootView.findViewById(R.id.menu).setVisibility(View.GONE);
+        mRootView.findViewById(R.id.on_screen_indicators).setVisibility(View.GONE);
+        mReview.setBackgroundColor(mReviewBackground);
+
+        // TODO: set display change listener properly.
+        ((CameraRootView) mRootView).setDisplayChangeListener(null);
+        mTextureView = (TextureView) mRootView.findViewById(R.id.pano_preview_textureview);
+        mTextureView.setSurfaceTextureListener(this);
+        mTextureView.addOnLayoutChangeListener(this);
+        mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
+
+        mDialogHelper = new DialogHelper();
+        setViews(appRes);
+    }
+
+    private void setViews(Resources appRes) {
+        int weight = appRes.getInteger(R.integer.SRI_pano_layout_weight);
+
+        LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mPreviewLayout.getLayoutParams();
+        lp.weight = weight;
+        mPreviewLayout.setLayoutParams(lp);
+
+        lp = (LinearLayout.LayoutParams) mReview.getLayoutParams();
+        lp.weight = weight;
+        mPreviewLayout.setLayoutParams(lp);
 
         mSavingProgressBar = (PanoProgressBar) mRootView.findViewById(R.id.pano_saving_progress_bar);
         mSavingProgressBar.setIndicatorWidth(0);
@@ -363,11 +390,6 @@ public class WideAnglePanoramaUI implements
         mSavingProgressBar.setBackgroundColor(appRes.getColor(R.color.pano_progress_empty));
         mSavingProgressBar.setDoneColor(appRes.getColor(R.color.pano_progress_indication));
 
-        mCaptureIndicator = mRootView.findViewById(R.id.pano_capture_indicator);
-
-        mReviewLayout = mRootView.findViewById(R.id.pano_review_layout);
-        mReview = (ImageView) mRootView.findViewById(R.id.pano_reviewarea);
-        mReview.setBackgroundColor(mReviewBackground);
         View cancelButton = mRootView.findViewById(R.id.pano_review_cancel_button);
         cancelButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -376,12 +398,7 @@ public class WideAnglePanoramaUI implements
             }
         });
 
-        mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button);
-        mShutterButton.setImageResource(R.drawable.btn_new_shutter);
-        mShutterButton.setOnShutterButtonListener(this);
-        // Hide menu and indicators.
-        mRootView.findViewById(R.id.menu).setVisibility(View.GONE);
-        mRootView.findViewById(R.id.on_screen_indicators).setVisibility(View.GONE);
+
     }
 
     private void showTooFastIndication() {
-- 
cgit v1.2.3