Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.

+ Move tablet resource to sw600dp and sw800dp

bug:5446617

Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628

7 files changed, 314 insertions, 0 deletions

diff --git a/res/layout-sw600dp/camera.xml b/res/layout-sw600dp/camera.xml
new file mode 100644
index 0000000..87ab2c7
--- /dev/null
+++ b/res/layout-sw600dp/camera.xml
@@ -0,0 +1,26 @@
+<?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-sw600dp/camera_control.xml b/res/layout-sw600dp/camera_control.xml
new file mode 100644
index 0000000..194547a
--- /dev/null
+++ b/res/layout-sw600dp/camera_control.xml
@@ -0,0 +1,55 @@
+<?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.
+-->
+
+<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: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
+             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"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="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:background="@drawable/btn_shutter" />
+            <com.android.camera.ui.IndicatorControlWheel android:id="@+id/indicator_control_wheel"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+            </com.android.camera.ui.IndicatorControlWheel>
+            <com.android.camera.ui.ZoomControlWheel
+                    android:id="@+id/zoom_control"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone" />
+        </com.android.camera.ui.IndicatorControlWheelContainer>
+        <include layout="@layout/mode_picker" />
+</com.android.camera.ui.ControlPanelLayout>
+
diff --git a/res/layout-sw600dp/mode_picker.xml b/res/layout-sw600dp/mode_picker.xml
new file mode 100644
index 0000000..a77485d
--- /dev/null
+++ b/res/layout-sw600dp/mode_picker.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/mode_picker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:visibility="gone">
+        <View android:id="@+id/current_mode_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_below="@+id/mode_selection"
+                android:background="@color/review_control_pressed_color"/>
+        <LinearLayout android:id="@+id/mode_selection"
+                android:orientation="horizontal"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="32dp"
+                android:layout_marginRight="32dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center">
+            <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_switch_camera_holo_light" />
+            <com.android.camera.ui.RotateImageView android:id="@+id/mode_video"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_switch_video_holo_light" />
+            <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_switch_pan_holo_light" />
+        </LinearLayout>
+</com.android.camera.ModePicker>
+
diff --git a/res/layout-sw600dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml
new file mode 100644
index 0000000..961a407
--- /dev/null
+++ b/res/layout-sw600dp/preview_frame.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/frame_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+    <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
+            android:layout_centerInParent="true"
+            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"/>
+        <com.android.camera.ui.FaceView android:id="@+id/face_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
+        <include layout="@layout/focus_indicator"/>
+        <include layout="@layout/priority_indicators"/>
+        <include layout="@layout/tap_to_focus_toast"/>
+    </com.android.camera.PreviewFrameLayout>
+</RelativeLayout>
diff --git a/res/layout-sw600dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml
new file mode 100644
index 0000000..69b7fe3
--- /dev/null
+++ b/res/layout-sw600dp/preview_frame_video.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/frame_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+    <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:background="@drawable/border_preview">
+        <SurfaceView android:id="@+id/camera_preview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
+                style="@style/ViewfinderLableLayout">
+            <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels_w1024" />
+        </com.android.camera.ui.RotateLayout>
+        <ImageView android:id="@+id/review_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                android:background="@android:color/black"/>
+        <com.android.camera.ui.RotateImageView
+                android:id="@+id/btn_play"
+                style="@style/ReviewControlIcon"
+                android:layout_centerInParent="true"
+                android:src="@drawable/ic_gallery_play"
+                android:background="@drawable/bg_pressed"
+                android:visibility="gone"
+                android:onClick="onReviewPlayClicked" />
+    </com.android.camera.PreviewFrameLayout>
+</RelativeLayout>
diff --git a/res/layout-sw600dp/review_control.xml b/res/layout-sw600dp/review_control.xml
new file mode 100644
index 0000000..ad973e8
--- /dev/null
+++ b/res/layout-sw600dp/review_control.xml
@@ -0,0 +1,63 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/review_control"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <com.android.camera.ui.RotateLayout
+            android:id="@+id/btn_done"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:visibility="gone"
+            android:layout_marginTop="36dp">
+        <LinearLayout style="@style/ReviewControlGroup"
+                android:onClick="onReviewDoneClicked">
+            <ImageView style="@style/ReviewControlIcon"
+                    android:src="@drawable/ic_menu_done_holo_light" />
+            <TextView style="@style/ReviewControlText"
+                    android:text="@string/review_ok" />
+        </LinearLayout>
+    </com.android.camera.ui.RotateLayout>
+    <ImageView android:id="@+id/btn_retake"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:clickable="true"
+            android:focusable="true"
+            android:visibility="gone"
+            android:onClick="onReviewRetakeClicked"
+            android:background="@drawable/btn_shutter_retake" />
+    <com.android.camera.ui.RotateLayout
+            android:id="@+id/btn_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:visibility="gone"
+            android:layout_marginBottom="36dp">
+        <LinearLayout style="@style/ReviewControlGroup"
+                android:onClick="onReviewCancelClicked">
+            <ImageView style="@style/ReviewControlIcon"
+                    android:src="@drawable/ic_menu_cancel_holo_light" />
+            <TextView style="@style/ReviewControlText"
+                    android:text="@string/review_cancel" />
+        </LinearLayout>
+    </com.android.camera.ui.RotateLayout>
+</RelativeLayout>
diff --git a/res/layout-sw600dp/video_camera.xml b/res/layout-sw600dp/video_camera.xml
new file mode 100644
index 0000000..809c7a5
--- /dev/null
+++ b/res/layout-sw600dp/video_camera.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<RelativeLayout 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:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+            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>
+    <include layout="@layout/bg_replacement_training_message"/>
+</RelativeLayout>