Increase camera preview frame size and other changes.

+ Increase camera preview frame size and align it to the left of the screen.
+ Move thumbnail to the lower left corner of the preview frame.
+ Move GPS indicator to the lower right corner of the preview frame.
+ Replace LinearLayout and negative margin with RelativeLayout.
+ Revise the look of the settings wheel based on new UI mock.
+ Add border to preview frame.
+ Make settings popup windows align with an invisible view in the root view.
  This makes it easier to adjust the location of the popup windows.

Bug: 3156693

Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99

8 files changed, 41 insertions, 33 deletions

diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml
index d26fd06..f366b49 100644
--- a/res/layout-xlarge/basic_setting_popup.xml
+++ b/res/layout-xlarge/basic_setting_popup.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="40dp"
+        android:layout_marginRight="225dp"
         android:orientation="vertical">
     <FrameLayout android:id="@+id/topPanel"
             android:layout_width="match_parent"
@@ -42,4 +42,3 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 </com.android.camera.ui.BasicSettingPopup>
-
diff --git a/res/layout-xlarge/camera.xml b/res/layout-xlarge/camera.xml
index 9367f98..796a033 100644
--- a/res/layout-xlarge/camera.xml
+++ b/res/layout-xlarge/camera.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
-        android:id="@+id/camera"
+        android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <include layout="@layout/review_thumbnail"/>
-    <include layout="@layout/preview_frame"/>
     <include layout="@layout/camera_control"/>
-</LinearLayout>
+    <include layout="@layout/preview_frame"/>
+</RelativeLayout>
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index 961ae27..132bcea 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -18,20 +18,19 @@
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/control_panel"
         android:layout_height="match_parent"
-        android:layout_width="230dp"
+        android:layout_width="wrap_content"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="40dp"
-        android:layout_marginLeft="-46dp"
         android:layout_marginBottom="40dp">
 
         <ViewStub android:id="@+id/zoom_stub"
                 android:inflatedId="@+id/zoom_picker"
                 android:layout="@layout/zoom_picker"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
                 android:layout_width="45dp"
                 android:layout_height="150dp"
-                android:layout_marginLeft="21dp"
-                android:layout_marginTop="10dp" />
+                android:layout_marginRight="160dp"/>
 
         <TextView android:id="@+id/recording_time"
                 style="@style/RecordingTime"
@@ -63,8 +62,8 @@
                         android:scaleType="center"
                         android:clickable="true"
                         android:focusable="true"
-                        android:src="@drawable/btn_ic_camera_shutter"
-                        android:background="@drawable/btn_shutter" />
+                        android:src="@drawable/btn_ic_camera_shutter_large"
+                        android:background="@drawable/btn_shutter_large" />
         </com.android.camera.ui.IndicatorWheel>
 
         <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
@@ -73,8 +72,8 @@
                 android:layout_height="150dp"
                 android:layout_width="45dp"
                 android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="21dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="160dp"
                 android:background="@drawable/mode_switch_bg_v2">
             <RadioButton android:id="@+id/switch_off_button"
                     android:layout_height="wrap_content"
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index b9eb587..7c61d7b 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="40dp"
+        android:layout_marginRight="225dp"
         android:orientation="vertical">
 
     <FrameLayout android:id="@+id/topPanel"
diff --git a/res/layout-xlarge/preview_frame.xml b/res/layout-xlarge/preview_frame.xml
index cba64ce..3e72bc5 100644
--- a/res/layout-xlarge/preview_frame.xml
+++ b/res/layout-xlarge/preview_frame.xml
@@ -15,16 +15,21 @@
 -->
 <com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
+        android:layout_width="1040dp"
         android:layout_height="match_parent"
-        android:layout_marginLeft="2dp"
-        android:layout_weight="1">
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <SurfaceView android:id="@+id/camera_preview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
+        <ImageView android:id="@+id/preview_border"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/border_preview"/>
         <com.android.camera.ui.FocusRectangle
                 android:id="@+id/focus_rectangle"
                 android:layout_width="match_parent"
@@ -32,17 +37,18 @@
         <ImageView style="@style/OnScreenGpsIndicator"
                 android:id="@+id/onscreen_gps_indicator_no_signal"
                 android:src="@drawable/ic_viewfinder_gps_no_signal"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:layout_margin="10dp"
                 android:visibility="invisible"/>
         <ImageView style="@style/OnScreenGpsIndicator"
                 android:id="@+id/onscreen_gps_indicator_on"
                 android:src="@drawable/ic_viewfinder_gps_on"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:layout_margin="10dp"
                 android:visibility="invisible"/>
+        <include layout="@layout/review_thumbnail"/>
     </RelativeLayout>
     <include layout="@layout/camera_picker" />
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml
index 99bae1f..0996799 100644
--- a/res/layout-xlarge/preview_frame_video.xml
+++ b/res/layout-xlarge/preview_frame_video.xml
@@ -16,20 +16,26 @@
 
 <com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
+        android:layout_width="1040dp"
         android:layout_height="match_parent"
-        android:layout_marginLeft="2dip"
-        android:layout_weight="1">
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="5dp">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <SurfaceView android:id="@+id/camera_preview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
+        <ImageView android:id="@+id/preview_border"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/border_preview"/>
         <ImageView android:id="@+id/video_frame"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone" />
+        <include layout="@layout/review_thumbnail"/>
     </RelativeLayout>
     <include layout="@layout/camera_picker"/>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-xlarge/review_thumbnail.xml b/res/layout-xlarge/review_thumbnail.xml
index c85d029..708c38e 100644
--- a/res/layout-xlarge/review_thumbnail.xml
+++ b/res/layout-xlarge/review_thumbnail.xml
@@ -18,9 +18,9 @@
         android:id="@+id/review_thumbnail"
         android:layout_width="112dp"
         android:layout_height="112dp"
-        android:layout_gravity="center"
-        android:layout_marginLeft="27dp"
-        android:layout_marginRight="27dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="10dp"
         android:clickable="true"
         android:focusable="false"
         android:background="@drawable/border_last_picture"/>
diff --git a/res/layout-xlarge/video_camera.xml b/res/layout-xlarge/video_camera.xml
index a0ae219..8c72cd9 100644
--- a/res/layout-xlarge/video_camera.xml
+++ b/res/layout-xlarge/video_camera.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
-        android:id="@+id/video_camera"
+        android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <include layout="@layout/review_thumbnail"/>
-    <include layout="@layout/preview_frame_video"/>
     <include layout="@layout/camera_control"/>
-</LinearLayout>
+    <include layout="@layout/preview_frame_video"/>
+</RelativeLayout>