Fix layout on 1024x600dp devices.

Change sw485dp to w1024dp and w1280dp. The wheel is not flexible
enough to scale according to the size. So w1024dp uses the same
wheel but smaller layout_width.

bug:4473360

Change-Id: I0eef53bd22b3cc0360b2e76fcff02f250ce3cdbf

15 files changed, 674 insertions, 0 deletions

diff --git a/res/layout-w1024dp/basic_setting_popup.xml b/res/layout-w1024dp/basic_setting_popup.xml
new file mode 100644
index 0000000..f437014
--- /dev/null
+++ b/res/layout-w1024dp/basic_setting_popup.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="410dp"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="229dp"
+        android:orientation="vertical"
+        android:visibility="invisible">
+    <FrameLayout android:id="@+id/topPanel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_top_holo_dark"
+            android:minHeight="48dp">
+        <TextView android:id="@+id/title"
+                style="@style/SettingTitleText" />
+    </FrameLayout>
+    <FrameLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_bottom_holo_dark">
+        <ListView android:id="@+id/settingList"
+                android:orientation="vertical"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:paddingBottom="3dp"
+                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:choiceMode="singleChoice" />
+    </FrameLayout>
+</com.android.camera.ui.BasicSettingPopup>
diff --git a/res/layout-w1024dp/camera.xml b/res/layout-w1024dp/camera.xml
new file mode 100644
index 0000000..6b327b0
--- /dev/null
+++ b/res/layout-w1024dp/camera.xml
@@ -0,0 +1,27 @@
+<?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"
+        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">
+
+    <include layout="@layout/camera_control"/>
+    <include layout="@layout/preview_frame"/>
+</RelativeLayout>
diff --git a/res/layout-w1024dp/camera_attach.xml b/res/layout-w1024dp/camera_attach.xml
new file mode 100644
index 0000000..6b327b0
--- /dev/null
+++ b/res/layout-w1024dp/camera_attach.xml
@@ -0,0 +1,27 @@
+<?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"
+        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">
+
+    <include layout="@layout/camera_control"/>
+    <include layout="@layout/preview_frame"/>
+</RelativeLayout>
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
new file mode 100644
index 0000000..5cb52e8
--- /dev/null
+++ b/res/layout-w1024dp/camera_control.xml
@@ -0,0 +1,92 @@
+<?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"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:id="@+id/control_panel"
+        android:layout_height="match_parent"
+        android:layout_width="@dimen/camera_control_width"
+        android:layout_alignParentRight="true">
+        <!-- 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 android:id="@+id/zoom_picker"
+                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="@dimen/zoom_picker_margin_top"
+                android:layout_marginRight="@dimen/zoom_picker_margin_right"/>
+
+        <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
+                    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:src="@drawable/btn_ic_camera_shutter"
+                        android:background="@drawable/btn_shutter" />
+        </com.android.camera.ui.IndicatorWheel>
+
+        <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
+                android:visibility="invisible"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:padding="14dp"
+                android:layout_marginRight="@dimen/mode_switcher_margin_right"
+                android:layout_marginBottom="@dimen/mode_switcher_margin_bottom">
+            <RadioButton android:id="@+id/switch_off_button"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:button="@android:color/transparent"
+                    android:clickable="false"
+                    android:background="@drawable/btn_ic_mode_switch_video"/>
+            <com.android.camera.HorizontalSwitcher android:id="@+id/switcher"
+                    android:layout_width="50dp"
+                    android:layout_height="18dp"
+                    android:layout_marginLeft="@dimen/mode_switcher_inner_margin"
+                    android:layout_marginRight="@dimen/mode_switcher_inner_margin"
+                    android:src="@drawable/toggle_switch_control_holo_dark"
+                    android:background="@drawable/toggle_switch_bg_holo_dark" />
+            <RadioButton android:id="@+id/switch_on_button"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:button="@android:color/transparent"
+                    android:clickable="false"
+                    android:background="@drawable/btn_ic_mode_switch_camera"/>
+        </com.android.camera.SwitcherSet>
+        <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
+                android:clickable="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_toLeftOf="@id/camera_switch"
+                android:layout_marginRight="@dimen/camera_switcher_margin_right"
+                android:layout_marginBottom="@dimen/camera_switcher_margin_bottom" />
+</RelativeLayout>
+
diff --git a/res/layout-w1024dp/in_line_setting_picker.xml b/res/layout-w1024dp/in_line_setting_picker.xml
new file mode 100644
index 0000000..f4ba7a4
--- /dev/null
+++ b/res/layout-w1024dp/in_line_setting_picker.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.InLineSettingPicker xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    <LinearLayout android:id="@+id/setting_item"
+            android:orientation="horizontal"
+            style="@style/SettingRow">
+        <TextView android:id="@+id/title"
+                style="@style/SettingPickerText"
+                android:layout_width="220dp"
+                android:layout_height="match_parent" />
+
+        <Button android:id="@+id/decrement"
+                android:layout_width="72dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:text="@string/setting_decrement"
+                android:textColor="@drawable/btn_setting_picker"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                android:background="@android:color/transparent" />
+
+        <TextView android:id="@+id/current_setting"
+                android:layout_width="130dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="@android:color/white"
+                android:textSize="20dp" />
+
+        <Button android:id="@+id/increment"
+                android:layout_width="72dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:text="@string/setting_increment"
+                android:textColor="@drawable/btn_setting_picker"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                android:background="@android:color/transparent" />
+    </LinearLayout>
+    <!--  To have the same View(InLineSettingPicker) as the listview's components and also show the restore setting line, we have the relativelayout and control the visibilities of the restore and the setting_item component to achieve the goal. -->
+    <TextView android:id="@+id/restore"
+            android:gravity="center"
+            android:textSize="22dp"
+            style="@style/SettingRow">
+    </TextView>
+</com.android.camera.ui.InLineSettingPicker>
diff --git a/res/layout-w1024dp/other_setting_popup.xml b/res/layout-w1024dp/other_setting_popup.xml
new file mode 100644
index 0000000..53847e1
--- /dev/null
+++ b/res/layout-w1024dp/other_setting_popup.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.OtherSettingsPopup xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="229dp"
+        android:orientation="vertical"
+        android:visibility="invisible">
+
+    <FrameLayout android:id="@+id/topPanel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_top_holo_dark"
+            android:minHeight="48dp">
+        <TextView android:id="@+id/title"
+                android:text="@string/pref_camera_settings_category"
+                style="@style/SettingTitleText" />
+    </FrameLayout>
+
+    <FrameLayout
+            android:layout_width="590dp"
+            android:layout_height="wrap_content"
+            android:background="@drawable/dialog_bottom_holo_dark">
+        <ListView android:id="@+id/settingList"
+                android:orientation="vertical"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:paddingBottom="3dp"
+                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+    </FrameLayout>
+</com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
new file mode 100644
index 0000000..221ec2c
--- /dev/null
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -0,0 +1,56 @@
+<?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.PreviewFrameLayout 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_toLeftOf="@id/control_panel">
+    <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_holo"/>
+        <com.android.camera.ui.FocusRectangle
+                android:id="@+id/focus_rectangle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+        <TextView android:id="@+id/zoom_ratio"
+                style="@style/OnViewfinderLabel"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/review_control"/>
+        <ImageView style="@style/OnScreenGpsIndicator"
+                android:id="@+id/onscreen_gps_indicator_no_signal"
+                android:src="@drawable/ic_viewfinder_gps_no_signal"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:layout_margin="15dp"
+                android:visibility="invisible"/>
+        <ImageView style="@style/OnScreenGpsIndicator"
+                android:id="@+id/onscreen_gps_indicator_on"
+                android:src="@drawable/ic_viewfinder_gps_on"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:layout_margin="15dp"
+                android:visibility="invisible"/>
+        <include layout="@layout/review_thumbnail"/>
+        <include layout="@layout/review_control"/>
+    </RelativeLayout>
+</com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
new file mode 100644
index 0000000..6757553
--- /dev/null
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -0,0 +1,66 @@
+<?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.PreviewFrameLayout 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_toLeftOf="@id/control_panel">
+    <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_holo"/>
+        <ImageView android:id="@+id/video_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone" />
+        <include layout="@layout/review_thumbnail"/>
+        <TextView android:id="@+id/recording_time"
+                style="@style/OnViewfinderLabel"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentRight="true"
+                android:gravity="center"
+                android:drawableLeft="@drawable/ic_recording_indicator_small"
+                android:drawablePadding="5dp"
+                android:visibility="gone"/>
+        <include layout="@layout/review_control"/>
+        <TextView android:id="@+id/time_lapse_label"
+                android:text="@string/time_lapse_title"
+                style="@style/OnViewfinderLabel"
+                android:layout_toLeftOf="@id/recording_time"
+                android:layout_below="@id/review_control"
+                android:layout_alignWithParentIfMissing="true"
+                android:visibility="gone"/>
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:background="@drawable/bg_text_on_preview"
+                android:visibility="gone">
+            <ImageView style="@style/ReviewControlIcon"
+                    android:id="@+id/btn_play"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:src="@drawable/btn_ic_review_play"/>
+        </LinearLayout>
+    </RelativeLayout>
+</com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-w1024dp/review_control.xml
new file mode 100644
index 0000000..63415d3
--- /dev/null
+++ b/res/layout-w1024dp/review_control.xml
@@ -0,0 +1,56 @@
+<?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"
+        android:id="@+id/review_control"
+        style="@style/ReviewControlGroup"
+        android:visibility="gone"
+        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: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: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"
+                style="@style/ReviewControlIcon"
+                android:drawableLeft="@drawable/ic_menu_cancel_holo_light"
+                android:text="@string/review_cancel"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-w1024dp/review_thumbnail.xml b/res/layout-w1024dp/review_thumbnail.xml
new file mode 100644
index 0000000..ce17517
--- /dev/null
+++ b/res/layout-w1024dp/review_thumbnail.xml
@@ -0,0 +1,27 @@
+<?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.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:visibility="invisible"
+        android:id="@+id/review_thumbnail"
+        android:layout_width="112dp"
+        android:layout_height="112dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="15dp"
+        android:clickable="true"
+        android:focusable="false"
+        android:background="@drawable/border_last_picture"/>
diff --git a/res/layout-w1024dp/setting_item.xml b/res/layout-w1024dp/setting_item.xml
new file mode 100644
index 0000000..43e6271
--- /dev/null
+++ b/res/layout-w1024dp/setting_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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"
+        style="@style/SettingRow">
+
+        <TextView android:id="@+id/text"
+                style="@style/SettingPickerText"
+                android:layout_width="267dp"
+                android:layout_height="match_parent"/>
+        <ImageView android:id="@+id/image"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:scaleType="fitCenter"
+                android:adjustViewBounds="true" />
+</LinearLayout>
diff --git a/res/layout-w1024dp/setting_scale_image_item.xml b/res/layout-w1024dp/setting_scale_image_item.xml
new file mode 100644
index 0000000..c5988fb
--- /dev/null
+++ b/res/layout-w1024dp/setting_scale_image_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.
+*/
+-->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="96dp"
+    android:layout_height="96dp"
+    android:layout_marginTop="10dp"
+    android:gravity="center"
+    android:scaleType="fitCenter"
+    android:minHeight="96dp"
+    android:minWidth="96dp" />
+
diff --git a/res/layout-w1024dp/video_camera.xml b/res/layout-w1024dp/video_camera.xml
new file mode 100644
index 0000000..afe0408
--- /dev/null
+++ b/res/layout-w1024dp/video_camera.xml
@@ -0,0 +1,27 @@
+<?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:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_ring_control_holo">
+
+    <include layout="@layout/camera_control"/>
+    <include layout="@layout/preview_frame_video"/>
+</RelativeLayout>
diff --git a/res/layout-w1024dp/video_camera_attach.xml b/res/layout-w1024dp/video_camera_attach.xml
new file mode 100644
index 0000000..958f72c
--- /dev/null
+++ b/res/layout-w1024dp/video_camera_attach.xml
@@ -0,0 +1,27 @@
+<?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"
+        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">
+
+    <include layout="@layout/camera_control"/>
+    <include layout="@layout/preview_frame_video"/>
+</RelativeLayout>
diff --git a/res/layout-w1024dp/zoom_picker.xml b/res/layout-w1024dp/zoom_picker.xml
new file mode 100644
index 0000000..e4a2808
--- /dev/null
+++ b/res/layout-w1024dp/zoom_picker.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 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.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:enabled="false">
+
+    <Button android:id="@+id/decrement"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:background="@drawable/btn_zoom_out" />
+
+    <Button android:id="@+id/increment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/zoom_picker_distance"
+            android:enabled="false"
+            android:background="@drawable/btn_zoom_in" />
+</com.android.camera.ui.ZoomPicker>