Remove preview layout and adjust widget size.

Since we now use GL to render the realtime preview, the original preview frame can
be removed then.  Also some widgets' size is adjusted.

bug:5142002
Change-Id: I8da708bab63b107b39e9e87a4893506dec171910

9 files changed, 50 insertions, 110 deletions

diff --git a/res/layout-w1024dp/pano_capture.xml b/res/layout-w1024dp/pano_capture.xml
deleted file mode 100644
index 0ce34b9..0000000
--- a/res/layout-w1024dp/pano_capture.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pano_capture_layout" android:visibility="invisible"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout android:layout_weight="1" android:gravity="center"
-        android:layout_width="match_parent" android:layout_height="match_parent">
-        <com.android.camera.panorama.CaptureView
-            android:id="@+id/pano_capture_view" android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-        <com.android.camera.panorama.MosaicRendererSurfaceView
-            android:id="@+id/pano_renderer" android:layout_gravity="center"
-            android:layout_width="960dp" android:layout_height="360dp" />
-    </FrameLayout>
-
-    <ImageView style="@style/PanoViewHorizontalGrayBar"
-        android:layout_alignParentTop="true" android:layout_width="match_parent" />
-
-    <LinearLayout android:id="@+id/pano_capture_control"
-            style="@style/PanoViewHorizontalGrayBar"
-            android:gravity="right"
-            android:orientation="horizontal"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent">
-
-        <Button android:id="@+id/pano_capture_stop_button"
-                android:text="@string/pano_capture_stop"
-                android:onClick="onStopButtonClicked"
-                android:textSize="24dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp" />
-    </LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index e95218a..39dd1ab 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -15,26 +15,34 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pano_capture_layout" android:visibility="invisible"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout android:layout_weight="1" android:gravity="center"
-        android:layout_width="match_parent" android:layout_height="match_parent">
+        android:id="@+id/pano_capture_layout"
+        android:visibility="visible"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <FrameLayout android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
         <com.android.camera.panorama.CaptureView
-            android:id="@+id/pano_capture_view" android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+                android:id="@+id/pano_capture_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
         <com.android.camera.panorama.MosaicRendererSurfaceView
-            android:id="@+id/pano_renderer" android:layout_gravity="center"
-            android:layout_width="640dp" android:layout_height="240dp" />
+                android:id="@+id/pano_renderer"
+                android:layout_gravity="center"
+                android:layout_width="@dimen/pano_mosaic_surface_width"
+                android:layout_height="@dimen/pano_mosaic_surface_height" />
     </FrameLayout>
 
     <ImageView style="@style/PanoViewHorizontalGrayBar"
-        android:layout_alignParentTop="true" android:layout_width="match_parent" />
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent" />
 
     <LinearLayout android:id="@+id/pano_capture_control"
             style="@style/PanoViewHorizontalGrayBar"
             android:gravity="right"
+            android:visibility="visible"
             android:orientation="horizontal"
             android:layout_alignParentBottom="true"
             android:layout_width="match_parent">
@@ -42,8 +50,11 @@
         <Button android:id="@+id/pano_capture_stop_button"
                 android:text="@string/pano_capture_stop"
                 android:onClick="onStopButtonClicked"
-                android:textSize="24dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp" />
+                android:visibility="gone"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:layout_width="@dimen/pano_capture_stop_button_width"
+                android:layout_height="@dimen/pano_capture_stop_button_width" />
     </LinearLayout>
+
+    <include layout="@layout/pano_control" android:id="@+id/pano_control_layout" />
 </RelativeLayout>
diff --git a/res/layout/pano_control.xml b/res/layout/pano_control.xml
index 3e2d4e8..52cbb54 100644
--- a/res/layout/pano_control.xml
+++ b/res/layout/pano_control.xml
@@ -18,17 +18,19 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:minWidth="@dimen/pano_control_layout_min_width"
+        android:layout_alignParentRight="true"
         android:background="@drawable/bg_camera_pattern">
 
     <include layout="@layout/review_thumbnail"/>
 
+    <include layout="@layout/mode_picker"/>
+
     <Button android:id="@+id/pano_start_button"
             android:text="@string/pano_capture_start"
             android:onClick="onStartButtonClicked"
-            android:textSize="24dp"
+            android:textAppearance="?android:textAppearanceMedium"
             android:layout_centerInParent="true"
             android:layout_width="@dimen/pano_control_start_button_size"
             android:layout_height="@dimen/pano_control_start_button_size" />
 
-    <include layout="@layout/mode_picker"/>
 </com.android.camera.ui.ControlPanelLayout>
diff --git a/res/layout/pano_preview.xml b/res/layout/pano_preview.xml
deleted file mode 100644
index a2ac86b..0000000
--- a/res/layout/pano_preview.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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:orientation="horizontal"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp">
-
-    <FrameLayout
-            android:gravity="center"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-        <SurfaceView
-                android:id="@+id/pano_preview_view"
-                android:layout_gravity="center"
-                android:layout_width="960dp"
-                android:layout_height="360dp"/>
-    </FrameLayout>
-
-    <include layout="@layout/pano_control" android:id="@+id/pano_control_layout" />
-</LinearLayout>
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 40dee1e..f574d6c 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -40,14 +40,14 @@
         <Button android:id="@+id/pano_review_retake_button"
                 android:text="@string/review_retake"
                 android:onClick="onRetakeButtonClicked"
-                android:textSize="24dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp" />
+                android:textAppearance="?android:textAppearanceMedium"
+                android:layout_width="@dimen/pano_review_button_width"
+                android:layout_height="@dimen/pano_review_button_height" />
         <Button android:id="@+id/pano_review_ok_button"
                 android:text="@string/review_ok"
+                android:textAppearance="?android:textAppearanceMedium"
                 android:onClick="onOkButtonClicked"
-                android:textSize="24dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp" />
+                android:layout_width="@dimen/pano_review_button_width"
+                android:layout_height="@dimen/pano_review_button_height" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml
index f826afe..2b25fe1 100644
--- a/res/layout/panorama.xml
+++ b/res/layout/panorama.xml
@@ -20,7 +20,6 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-    <include layout="@layout/pano_preview" />
     <include layout="@layout/pano_capture" />
     <include layout="@layout/pano_review" />
 </RelativeLayout>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index ad0edf5..f6554ab 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -32,4 +32,11 @@
     <dimen name="share_list_width_landscape">200dp</dimen>
     <dimen name="pano_control_layout_min_width">260dp</dimen>
     <dimen name="pano_control_start_button_size">180dp</dimen>
+    <dimen name="pano_mosaic_surface_width">960dp</dimen>
+    <dimen name="pano_mosaic_surface_height">360dp</dimen>
+    <dimen name="pano_gray_bar_height">180dp</dimen>
+    <dimen name="pano_capture_stop_button_width">160dp</dimen>
+    <dimen name="pano_capture_stop_button_height">160dp</dimen>
+    <dimen name="pano_review_button_width">180dp</dimen>
+    <dimen name="pano_review_button_height">180dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a571bf6..fbd3616 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -26,4 +26,11 @@
     <dimen name="share_list_width_landscape">180dp</dimen>
     <dimen name="pano_control_layout_min_width">76dp</dimen>
     <dimen name="pano_control_start_button_size">70dp</dimen>
+    <dimen name="pano_mosaic_surface_width">640dp</dimen>
+    <dimen name="pano_mosaic_surface_height">240dp</dimen>
+    <dimen name="pano_gray_bar_height">80dp</dimen>
+    <dimen name="pano_capture_stop_button_width">70dp</dimen>
+    <dimen name="pano_capture_stop_button_height">70dp</dimen>
+    <dimen name="pano_review_button_width">70dp</dimen>
+    <dimen name="pano_review_button_height">70dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3219e1a..e299915 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -124,6 +124,6 @@
         <item name="android:background">#444444</item>
         <item name="android:alpha">0.5</item>
         <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">180dp</item>
+        <item name="android:layout_height">@dimen/pano_gray_bar_height</item>
     </style>
 </resources>