Change recording time position for xlarge layout.

Move recording time to the top right of the camera control
panel.
Change-Id: I8c13d2903f568d479d1aa963c6f0955e3126860c

2 files changed, 113 insertions, 50 deletions

diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml
index 76ab293..82ddc55 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-xlarge/camera_control.xml
@@ -15,74 +15,96 @@
 -->
 
 <com.android.camera.ui.ControlPanel xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/control_panel"
         android:layout_height="match_parent"
         android:layout_width="240dp"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="20dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_alignParentRight="true">
+        android:layout_marginRight="10dp">
 
     <ListView android:id="@+id/thumbnail_list"
             android:layout_width="96dp"
             android:layout_height="match_parent"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
             android:dividerHeight="6dp"
             android:orientation="vertical"
             android:gravity="center">
     </ListView>
 
-    <ViewStub android:id="@+id/zoom_stub"
-            android:inflatedId="@+id/zoom_picker"
-            android:layout="@layout/zoom_picker"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_centerInParent="true"/>
+    <RelativeLayout
+            android:layout_width="134dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_alignParentRight="true">
 
-    <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
-                android:layout_width="144dp"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_alignParentRight="true">
-        <com.android.camera.ShutterButton android:id="@+id/shutter_button"
+            <ViewStub android:id="@+id/zoom_stub"
+                    android:inflatedId="@+id/zoom_picker"
+                    android:layout="@layout/zoom_picker"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp" />
+
+            <TextView android:id="@+id/recording_time"
+                    style="@style/RecordingTime"
                     android:layout_width="wrap_content"
-                    android:scaleType="center"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:src="@drawable/btn_ic_camera_shutter"
-                    android:background="@drawable/btn_shutter" />
-    </com.android.camera.ui.IndicatorWheel>
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginRight="10dp"
+                    android:drawablePadding="8dp"
+                    android:drawableLeft="@drawable/ic_recording_indicator"
+                    android:visibility="gone" />
 
-    <LinearLayout android:id="@+id/camera_switch_set"
-            android:orientation="vertical"
-            android:gravity="center"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_marginRight="17dp">
-        <com.android.camera.RotateImageView android:id="@+id/video_switch_icon"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:src="@drawable/btn_ic_mode_switch_video"/>
-        <com.android.camera.Switcher android:id="@+id/camera_switch"
-                android:layout_width="wrap_content"
-                android:layout_height="70dp"
-                android:src="@drawable/btn_mode_switch_knob"
-                android:background="@drawable/btn_mode_switch_bg" />
-        <com.android.camera.RotateImageView
-                android:id="@+id/camera_switch_icon"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:src="@drawable/btn_ic_mode_switch_camera"/>
-    </LinearLayout>
+            <TextView android:id="@+id/time_lapse_recording_time"
+                    style="@style/RecordingTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/recording_time"
+                    android:layout_alignParentRight="true"
+                    android:visibility="gone" />
+
+            <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_alignParentRight="true">
+                <com.android.camera.ShutterButton android:id="@+id/shutter_button"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:scaleType="center"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:src="@drawable/btn_ic_camera_shutter"
+                            android:background="@drawable/btn_shutter" />
+            </com.android.camera.ui.IndicatorWheel>
+
+            <LinearLayout android:id="@+id/camera_switch_set"
+                    android:orientation="vertical"
+                    android:gravity="center"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="17dp">
+                <com.android.camera.RotateImageView android:id="@+id/video_switch_icon"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/btn_ic_mode_switch_video"/>
+                <com.android.camera.Switcher android:id="@+id/camera_switch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="70dp"
+                        android:src="@drawable/btn_mode_switch_knob"
+                        android:background="@drawable/btn_mode_switch_bg" />
+                <com.android.camera.RotateImageView
+                        android:id="@+id/camera_switch_icon"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/btn_ic_mode_switch_camera"/>
+            </LinearLayout>
+    </RelativeLayout>
 </com.android.camera.ui.ControlPanel>
 
diff --git a/res/layout-xlarge/video_camera.xml b/res/layout-xlarge/video_camera.xml
new file mode 100644
index 0000000..d20a9b3
--- /dev/null
+++ b/res/layout-xlarge/video_camera.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:id="@+id/video_camera"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="2dip"
+            android:layout_weight="1">
+        <FrameLayout android:id="@+id/frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/border_view_finder">
+            <SurfaceView android:id="@+id/camera_preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+            <ImageView android:id="@+id/video_frame"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
+        </FrameLayout>
+    </com.android.camera.PreviewFrameLayout>
+</LinearLayout>