Move review control out of preview.

bug:5141555
Change-Id: I04e4ca0d0e1a40ccfe39e5276fda66ffd02ae1b5

6 files changed, 26 insertions, 105 deletions

diff --git a/res/layout-w1024dp/camera_attach.xml b/res/layout-w1024dp/camera_attach.xml
deleted file mode 100644
index 87ab2c7..0000000
--- a/res/layout-w1024dp/camera_attach.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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/app_root"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <include layout="@layout/preview_frame"/>
-    <include layout="@layout/camera_control"/>
-</LinearLayout>
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 0ba7d6c..63bb643 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -27,6 +27,7 @@
              unfortunate that we have to hardcode the width here. -->
 
         <include layout="@layout/review_thumbnail" />
+        <include layout="@layout/review_control" />
 
         <com.android.camera.ui.IndicatorControlWheelContainer android:id="@+id/indicator_control"
                 android:layout_width="wrap_content"
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 6965aed..d7f00b1 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -31,7 +31,6 @@
                 android:visibility="gone"/>
         <include layout="@layout/focus_rect"/>
         <include layout="@layout/priority_indicators"/>
-        <include layout="@layout/review_control"/>
         <include layout="@layout/tap_to_focus_toast"/>
     </RelativeLayout>
     <!-- This is the border of preview and the corner is round. If it is the background,
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 039a76d..8760ff0 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -41,20 +41,12 @@
                     android:drawablePadding="5dp"
                     android:visibility="gone"/>
         </LinearLayout>
-        <include layout="@layout/review_control"/>
-        <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+        <ImageButton android:id="@+id/btn_play"
+                style="@style/ReviewControlIcon"
                 android:layout_centerInParent="true"
-                android:background="@drawable/bg_text_on_preview"
-                android:visibility="gone">
-            <ImageView style="@style/ReviewControlIcon"
-                    android:id="@+id/btn_play"
-                    android:onClick="onPlayButtonClicked"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:src="@drawable/btn_ic_review_play"/>
-        </LinearLayout>
+                android:src="@drawable/btn_ic_review_play"
+                android:visibility="gone"
+                android:onClick="onPlayButtonClicked"/>
         <ImageView android:id="@+id/review_image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-w1024dp/review_control.xml
index 659670f..a973dc8 100644
--- a/res/layout-w1024dp/review_control.xml
+++ b/res/layout-w1024dp/review_control.xml
@@ -16,44 +16,25 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/review_control"
-        style="@style/ReviewControlGroup"
-        android:visibility="gone"
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/bg_text_on_preview">
-
-    <LinearLayout style="@style/ReviewControlGroup"
-            android:visibility="gone">
-        <Button android:id="@+id/btn_done"
-                style="@style/ReviewControlIcon"
-                android:onClick="onDoneButtonClicked"
-                android:drawableLeft="@drawable/ic_menu_done_holo_light"
-                android:text="@string/review_ok"/>
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_divider"/>
-    </LinearLayout>
-    <LinearLayout style="@style/ReviewControlGroup"
-            android:visibility="gone">
-        <Button android:id="@+id/btn_retake"
-                style="@style/ReviewControlIcon"
-                android:scaleType="center"
-                android:clickable="true"
-                android:onClick="onRetakeButtonClicked"
-                android:drawableLeft="@drawable/ic_switch_camera_holo_dark"/>
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_menu_divider"/>
-    </LinearLayout>
-    <LinearLayout style="@style/ReviewControlGroup">
-        <Button android:id="@+id/btn_cancel"
-                android:onClick="onCancelButtonClicked"
-                style="@style/ReviewControlIcon"
-                android:drawableLeft="@drawable/ic_menu_cancel_holo_light"
-                android:text="@string/review_cancel"/>
-    </LinearLayout>
+        android:gravity="center_horizontal"
+        android:layout_marginTop="30dp">
+    <Button android:id="@+id/btn_cancel"
+            android:text="@string/review_cancel"
+            style="@style/ReviewControlIcon"
+            android:visibility="gone"
+            android:onClick="onCancelButtonClicked" />
+    <Button android:id="@+id/btn_retake"
+            android:text="@string/review_retake"
+            style="@style/ReviewControlIcon"
+            android:visibility="gone"
+            android:onClick="onRetakeButtonClicked" />
+    <ImageButton android:id="@+id/btn_done"
+            android:src="@drawable/ic_menu_done_holo_light"
+            style="@style/ReviewControlIcon"
+            android:visibility="gone"
+            android:onClick="onDoneButtonClicked" />
 </LinearLayout>
diff --git a/res/layout-w1024dp/video_camera_attach.xml b/res/layout-w1024dp/video_camera_attach.xml
deleted file mode 100644
index 94011a3..0000000
--- a/res/layout-w1024dp/video_camera_attach.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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/app_root"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <include layout="@layout/preview_frame_video"/>
-    <include layout="@layout/camera_control"/>
-</LinearLayout>