Use new background and shutter button.

bug:5024054

Change-Id: I2def331433b0db66efc0d38f1e9537c0980441bb

8 files changed, 28 insertions, 34 deletions

diff --git a/res/layout-w1024dp/camera.xml b/res/layout-w1024dp/camera.xml
index 6b327b0..87ab2c7 100644
--- a/res/layout-w1024dp/camera.xml
+++ b/res/layout-w1024dp/camera.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/bg_ring_control_holo">
+        android:layout_height="match_parent">
 
-    <include layout="@layout/camera_control"/>
     <include layout="@layout/preview_frame"/>
-</RelativeLayout>
+    <include layout="@layout/camera_control"/>
+</LinearLayout>
diff --git a/res/layout-w1024dp/camera_attach.xml b/res/layout-w1024dp/camera_attach.xml
index 6b327b0..87ab2c7 100644
--- a/res/layout-w1024dp/camera_attach.xml
+++ b/res/layout-w1024dp/camera_attach.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/bg_ring_control_holo">
+        android:layout_height="match_parent">
 
-    <include layout="@layout/camera_control"/>
     <include layout="@layout/preview_frame"/>
-</RelativeLayout>
+    <include layout="@layout/camera_control"/>
+</LinearLayout>
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index ca70b44..342d167 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.ControlPanelLayout 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_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_width="@dimen/camera_control_width"
-        android:layout_alignParentRight="true">
+        android:minWidth="260dp"
+        android:background="@drawable/bg_camera_pattern">
         <!-- The width is determined by IndicatorWheel so we should set
              layout_width as wrap_contant but RelativeLayout Javadoc says that
              this is circular dependency and is not allowed so it's very
@@ -38,7 +39,6 @@
                         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.RotateImageView android:id="@+id/zoom_increment"
                     android:clickable="true"
@@ -61,5 +61,5 @@
         </com.android.camera.ui.IndicatorWheel>
 
         <include layout="@layout/mode_picker"/>
-</RelativeLayout>
+</com.android.camera.ui.ControlPanelLayout>
 
diff --git a/res/layout-w1024dp/pano_control.xml b/res/layout-w1024dp/pano_control.xml
index 1882ff6..e218fa5 100644
--- a/res/layout-w1024dp/pano_control.xml
+++ b/res/layout-w1024dp/pano_control.xml
@@ -14,10 +14,11 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_width="@dimen/camera_control_width"
-        android:layout_alignParentRight="true">
+        android:minWidth="260dp"
+        android:background="@drawable/bg_camera_pattern">
 
     <include layout="@layout/review_thumbnail"/>
 
@@ -26,12 +27,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="32dp"
-            android:scaleType="center"
             android:clickable="true"
             android:focusable="true"
-            android:src="@drawable/btn_ic_camera_shutter"
             android:background="@drawable/btn_shutter"/>
 
     <include layout="@layout/mode_picker"/>
-</RelativeLayout>
+</com.android.camera.ui.ControlPanelLayout>
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 9cfc206..41c419f 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -17,7 +17,7 @@
         android:id="@+id/frame_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_toLeftOf="@id/control_panel">
+        android:layout_weight="1">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 11fe590..0323d40 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -18,7 +18,7 @@
         android:id="@+id/frame_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_toLeftOf="@id/control_panel">
+        android:layout_weight="1">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/res/layout-w1024dp/video_camera.xml b/res/layout-w1024dp/video_camera.xml
index afe0408..76a4624 100644
--- a/res/layout-w1024dp/video_camera.xml
+++ b/res/layout-w1024dp/video_camera.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/bg_ring_control_holo">
+        android:layout_height="match_parent">
 
-    <include layout="@layout/camera_control"/>
     <include layout="@layout/preview_frame_video"/>
-</RelativeLayout>
+    <include layout="@layout/camera_control"/>
+</LinearLayout>
diff --git a/res/layout-w1024dp/video_camera_attach.xml b/res/layout-w1024dp/video_camera_attach.xml
index 958f72c..94011a3 100644
--- a/res/layout-w1024dp/video_camera_attach.xml
+++ b/res/layout-w1024dp/video_camera_attach.xml
@@ -14,14 +14,13 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/app_root"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/bg_ring_control_holo">
+        android:layout_height="match_parent">
 
-    <include layout="@layout/camera_control"/>
     <include layout="@layout/preview_frame_video"/>
-</RelativeLayout>
+    <include layout="@layout/camera_control"/>
+</LinearLayout>