From f29da1211f7814a59b1ef648274478125ce23c8d Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 30 Nov 2016 09:20:26 +0100
Subject: Modernize look of review controls.

Change-Id: I79f74502364a523a7c9c9f8ae3c63c3fcfebac3d
---
 res/layout/camera_controls.xml | 112 +++++++++++++++++++++++------------------
 1 file changed, 63 insertions(+), 49 deletions(-)

(limited to 'res/layout/camera_controls.xml')

diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 04c2f9e46..5e6993e12 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -71,67 +71,81 @@
         android:id="@+id/bottom_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/preview_bottom_margin"
-        android:gravity="center"
-        android:weightSum="100"
         android:background="@drawable/camera_controls_bg_opaque"
-        android:orientation="horizontal">
-
-        <com.android.camera.ui.RotateImageView
-            android:id="@+id/preview_thumb"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/thumbnail_size"
-            android:layout_weight="25"
-            android:layout_gravity="center_horizontal|center_vertical"
-            android:background="@android:color/transparent"
-            android:contentDescription="@string/switch_photo_filmstrip"
-            android:scaleType="fitCenter" />
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:gravity="center"
-            android:layout_weight="50"
+            android:weightSum="100"
             android:orientation="horizontal">
 
-            <com.android.camera.ShutterButton
-                android:id="@+id/shutter_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            <com.android.camera.ui.RotateImageView
+                android:id="@+id/preview_thumb"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/thumbnail_size"
+                android:layout_weight="25"
                 android:layout_gravity="center_horizontal|center_vertical"
-                android:clickable="true"
-                android:contentDescription="@string/accessibility_shutter_button"
-                android:focusable="true"
-                android:scaleType="fitCenter"
-                android:src="@drawable/btn_new_shutter" />
-
-            <ImageView
-                android:id="@+id/video_button"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
+                android:background="@android:color/transparent"
+                android:contentDescription="@string/switch_photo_filmstrip"
+                android:scaleType="fitCenter" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:layout_weight="50"
+                android:orientation="horizontal">
+
+                <com.android.camera.ShutterButton
+                    android:id="@+id/shutter_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal|center_vertical"
+                    android:clickable="true"
+                    android:contentDescription="@string/accessibility_shutter_button"
+                    android:focusable="true"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/btn_new_shutter" />
+
+                <ImageView
+                    android:id="@+id/video_button"
+                    android:visibility="gone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal|center_vertical"
+                    android:clickable="true"
+                    android:contentDescription="@string/accessibility_shutter_button"
+                    android:focusable="true"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/btn_new_shutter_video" />
+
+            </LinearLayout>
+
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|center_vertical"
-                android:clickable="true"
-                android:contentDescription="@string/accessibility_shutter_button"
-                android:focusable="true"
-                android:scaleType="fitCenter"
-                android:src="@drawable/btn_new_shutter_video" />
+                android:layout_weight="25">
 
-        </LinearLayout>
+                <com.android.camera.ui.ModuleSwitcher
+                    android:id="@+id/camera_switcher"
+                    style="@style/SwitcherButton"
+                    android:layout_gravity="center"
+                    android:scaleType="center"
+                    android:contentDescription="@string/accessibility_mode_picker" />
+            </FrameLayout>
 
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="25">
+        </LinearLayout>
 
-            <com.android.camera.ui.ModuleSwitcher
-                android:id="@+id/camera_switcher"
-                style="@style/SwitcherButton"
-                android:layout_gravity="center"
-                android:scaleType="center"
-                android:contentDescription="@string/accessibility_mode_picker" />
-        </FrameLayout>
+        <ViewStub
+            android:id="@+id/review_control_stub"
+            android:layout="@layout/review_module_control"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
-	</LinearLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/remaining_photos"
-- 
cgit v1.2.3