Prevent the top/bottom bars block capture view.

bug:5142001
Change-Id: I262e801a93c18e1e9affa00258d2a7030c94024b

4 files changed, 22 insertions, 25 deletions

diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 67d302d..7736ddf 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -20,35 +20,33 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <FrameLayout android:gravity="center"
+    <LinearLayout android:id="@+id/pano_capture_preview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+        <ImageView style="@style/PanoViewHorizontalGrayBar"/>
+
         <com.android.camera.panorama.MosaicRendererSurfaceView
                 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" />
-
-    <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">
+        <LinearLayout android:id="@+id/pano_capture_control"
+                style="@style/PanoViewHorizontalGrayBar"
+                android:gravity="right"
+                android:visibility="visible"
+                android:orientation="horizontal">
 
-        <Button android:id="@+id/pano_capture_stop_button"
-                android:text="@string/pano_capture_stop"
-                android:onClick="onStopButtonClicked"
-                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" />
+            <Button android:id="@+id/pano_capture_stop_button"
+                    android:text="@string/pano_capture_stop"
+                    android:onClick="onStopButtonClicked"
+                    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>
     </LinearLayout>
 
     <com.android.camera.panorama.IndicationView
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index 9eaed76..977c770 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -30,7 +30,6 @@
     <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>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2504eb4..63bb9b3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -26,7 +26,6 @@
     <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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4c97422..eb7d30f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -151,8 +151,9 @@
     <style name="PanoViewHorizontalGrayBar">
         <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">@dimen/pano_gray_bar_height</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">0.5</item>
     </style>
     <style name="ReviewThumbnail">
         <item name="android:layout_width">52dp</item>