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

49 files changed, 75 insertions, 37 deletions

diff --git a/res/drawable-sw485dp/btn_ic_camera_shutter.xml b/res/drawable-w1024dp/btn_ic_camera_shutter.xml
index aa98917..aa98917 100644
--- a/res/drawable-sw485dp/btn_ic_camera_shutter.xml
+++ b/res/drawable-w1024dp/btn_ic_camera_shutter.xml
diff --git a/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml b/res/drawable-w1024dp/btn_ic_mode_switch_camera.xml
index e0e4952..e0e4952 100644
--- a/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml
+++ b/res/drawable-w1024dp/btn_ic_mode_switch_camera.xml
diff --git a/res/drawable-sw485dp/btn_ic_mode_switch_video.xml b/res/drawable-w1024dp/btn_ic_mode_switch_video.xml
index 018dcfc..018dcfc 100644
--- a/res/drawable-sw485dp/btn_ic_mode_switch_video.xml
+++ b/res/drawable-w1024dp/btn_ic_mode_switch_video.xml
diff --git a/res/drawable-sw485dp/btn_ic_review_play.png b/res/drawable-w1024dp/btn_ic_review_play.png
index 6eca85c..6eca85c 100755
--- a/res/drawable-sw485dp/btn_ic_review_play.png
+++ b/res/drawable-w1024dp/btn_ic_review_play.png
diff --git a/res/drawable-sw485dp/btn_ic_video_record_stop.png b/res/drawable-w1024dp/btn_ic_video_record_stop.png
index b123eaf..b123eaf 100755
--- a/res/drawable-sw485dp/btn_ic_video_record_stop.png
+++ b/res/drawable-w1024dp/btn_ic_video_record_stop.png
diff --git a/res/drawable-sw485dp/btn_review_control.xml b/res/drawable-w1024dp/btn_review_control.xml
index 1dd81ca..1dd81ca 100644
--- a/res/drawable-sw485dp/btn_review_control.xml
+++ b/res/drawable-w1024dp/btn_review_control.xml
diff --git a/res/drawable-sw485dp/btn_shutter.xml b/res/drawable-w1024dp/btn_shutter.xml
index d1772ae..d1772ae 100644
--- a/res/drawable-sw485dp/btn_shutter.xml
+++ b/res/drawable-w1024dp/btn_shutter.xml
diff --git a/res/drawable-sw485dp/btn_shutter_recording.xml b/res/drawable-w1024dp/btn_shutter_recording.xml
index c2a07ff..c2a07ff 100644
--- a/res/drawable-sw485dp/btn_shutter_recording.xml
+++ b/res/drawable-w1024dp/btn_shutter_recording.xml
diff --git a/res/drawable-sw485dp/btn_zoom_in.xml b/res/drawable-w1024dp/btn_zoom_in.xml
index d798b5a..d798b5a 100644
--- a/res/drawable-sw485dp/btn_zoom_in.xml
+++ b/res/drawable-w1024dp/btn_zoom_in.xml
diff --git a/res/drawable-sw485dp/btn_zoom_out.xml b/res/drawable-w1024dp/btn_zoom_out.xml
index 925327d..925327d 100644
--- a/res/drawable-sw485dp/btn_zoom_out.xml
+++ b/res/drawable-w1024dp/btn_zoom_out.xml
diff --git a/res/drawable-sw485dp/button_camera_shutter_holo.png b/res/drawable-w1024dp/button_camera_shutter_holo.png
index 556c921..556c921 100644
--- a/res/drawable-sw485dp/button_camera_shutter_holo.png
+++ b/res/drawable-w1024dp/button_camera_shutter_holo.png
diff --git a/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png b/res/drawable-w1024dp/button_camera_shutter_pressed_holo.png
index 7ccc389..7ccc389 100644
--- a/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png
+++ b/res/drawable-w1024dp/button_camera_shutter_pressed_holo.png
diff --git a/res/drawable-sw485dp/button_ic_camera_shutter.png b/res/drawable-w1024dp/button_ic_camera_shutter.png
index 34a36af..34a36af 100644
--- a/res/drawable-sw485dp/button_ic_camera_shutter.png
+++ b/res/drawable-w1024dp/button_ic_camera_shutter.png
diff --git a/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png b/res/drawable-w1024dp/button_ic_camera_shutter_pressed.png
index baa0c3f..baa0c3f 100644
--- a/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png
+++ b/res/drawable-w1024dp/button_ic_camera_shutter_pressed.png
diff --git a/res/drawable-sw485dp/button_video_shutter_holo.png b/res/drawable-w1024dp/button_video_shutter_holo.png
index 8c8b4df..8c8b4df 100644
--- a/res/drawable-sw485dp/button_video_shutter_holo.png
+++ b/res/drawable-w1024dp/button_video_shutter_holo.png
diff --git a/res/drawable-sw485dp/button_video_shutter_pressed_holo.png b/res/drawable-w1024dp/button_video_shutter_pressed_holo.png
index 903a57a..903a57a 100644
--- a/res/drawable-sw485dp/button_video_shutter_pressed_holo.png
+++ b/res/drawable-w1024dp/button_video_shutter_pressed_holo.png
diff --git a/res/drawable-sw485dp/ic_time_lapse_holo_dark.png b/res/drawable-w1024dp/ic_time_lapse_holo_dark.png
index 2bb9c57..2bb9c57 100644
--- a/res/drawable-sw485dp/ic_time_lapse_holo_dark.png
+++ b/res/drawable-w1024dp/ic_time_lapse_holo_dark.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_coloreffect.png b/res/drawable-w1024dp/ic_viewfinder_coloreffect.png
index 738ef05..738ef05 100644
--- a/res/drawable-sw485dp/ic_viewfinder_coloreffect.png
+++ b/res/drawable-w1024dp/ic_viewfinder_coloreffect.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_auto.png b/res/drawable-w1024dp/ic_viewfinder_flash_auto.png
index 7b1cb6c..7b1cb6c 100644
--- a/res/drawable-sw485dp/ic_viewfinder_flash_auto.png
+++ b/res/drawable-w1024dp/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_off.png b/res/drawable-w1024dp/ic_viewfinder_flash_off.png
index ecf8220..ecf8220 100644
--- a/res/drawable-sw485dp/ic_viewfinder_flash_off.png
+++ b/res/drawable-w1024dp/ic_viewfinder_flash_off.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_flash_on.png b/res/drawable-w1024dp/ic_viewfinder_flash_on.png
index c01a882..c01a882 100644
--- a/res/drawable-sw485dp/ic_viewfinder_flash_on.png
+++ b/res/drawable-w1024dp/ic_viewfinder_flash_on.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_scene_mode.png b/res/drawable-w1024dp/ic_viewfinder_scene_mode.png
index d11b057..d11b057 100644
--- a/res/drawable-sw485dp/ic_viewfinder_scene_mode.png
+++ b/res/drawable-w1024dp/ic_viewfinder_scene_mode.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_settings.png b/res/drawable-w1024dp/ic_viewfinder_settings.png
index 3093ed7..3093ed7 100644
--- a/res/drawable-sw485dp/ic_viewfinder_settings.png
+++ b/res/drawable-w1024dp/ic_viewfinder_settings.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png b/res/drawable-w1024dp/ic_viewfinder_video_quality_high.png
index 2fcbd8b..2fcbd8b 100644
--- a/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png
+++ b/res/drawable-w1024dp/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png b/res/drawable-w1024dp/ic_viewfinder_video_quality_low.png
index 9158059..9158059 100644
--- a/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png
+++ b/res/drawable-w1024dp/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png b/res/drawable-w1024dp/ic_viewfinder_video_quality_youtube.png
index 7d279af..7d279af 100644
--- a/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png
+++ b/res/drawable-w1024dp/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_auto.png b/res/drawable-w1024dp/ic_viewfinder_wb_auto.png
index cf8ddb4..cf8ddb4 100644
--- a/res/drawable-sw485dp/ic_viewfinder_wb_auto.png
+++ b/res/drawable-w1024dp/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png b/res/drawable-w1024dp/ic_viewfinder_wb_daylight.png
index 6472b09..6472b09 100644
--- a/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png
+++ b/res/drawable-w1024dp/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png b/res/drawable-w1024dp/ic_viewfinder_wb_fluorescent.png
index 509f436..509f436 100644
--- a/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png
+++ b/res/drawable-w1024dp/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png b/res/drawable-w1024dp/ic_viewfinder_wb_incandescent.png
index 1ef4d2e..1ef4d2e 100644
--- a/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png
+++ b/res/drawable-w1024dp/ic_viewfinder_wb_incandescent.png
diff --git a/res/layout-sw485dp/basic_setting_popup.xml b/res/layout-w1024dp/basic_setting_popup.xml
index 9be5ada..f437014 100644
--- a/res/layout-sw485dp/basic_setting_popup.xml
+++ b/res/layout-w1024dp/basic_setting_popup.xml
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/dialog_top_holo_dark"
-            android:minHeight="48dip">
+            android:minHeight="48dp">
         <TextView android:id="@+id/title"
                 style="@style/SettingTitleText" />
     </FrameLayout>
diff --git a/res/layout-sw485dp/camera.xml b/res/layout-w1024dp/camera.xml
index 6b327b0..6b327b0 100644
--- a/res/layout-sw485dp/camera.xml
+++ b/res/layout-w1024dp/camera.xml
diff --git a/res/layout-sw485dp/camera_attach.xml b/res/layout-w1024dp/camera_attach.xml
index 6b327b0..6b327b0 100644
--- a/res/layout-sw485dp/camera_attach.xml
+++ b/res/layout-w1024dp/camera_attach.xml
diff --git a/res/layout-sw485dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 78aca3d..5cb52e8 100644
--- a/res/layout-sw485dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -18,7 +18,7 @@
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
         android:id="@+id/control_panel"
         android:layout_height="match_parent"
-        android:layout_width="302dp"
+        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
@@ -31,8 +31,8 @@
                 android:layout_alignParentRight="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="48dp"
-                android:layout_marginRight="32dp"/>
+                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"
@@ -58,8 +58,8 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
                 android:padding="14dp"
-                android:layout_marginRight="34dp"
-                android:layout_marginBottom="50dp">
+                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"
@@ -69,8 +69,8 @@
             <com.android.camera.HorizontalSwitcher android:id="@+id/switcher"
                     android:layout_width="50dp"
                     android:layout_height="18dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
+                    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"
@@ -84,9 +84,9 @@
                 android:clickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
-                android:layout_marginRight="232dp"
-                android:layout_marginBottom="56dp" />
+                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-sw485dp/in_line_setting_picker.xml b/res/layout-w1024dp/in_line_setting_picker.xml
index f4ba7a4..f4ba7a4 100644
--- a/res/layout-sw485dp/in_line_setting_picker.xml
+++ b/res/layout-w1024dp/in_line_setting_picker.xml
diff --git a/res/layout-sw485dp/other_setting_popup.xml b/res/layout-w1024dp/other_setting_popup.xml
index 4dfbe62..53847e1 100644
--- a/res/layout-sw485dp/other_setting_popup.xml
+++ b/res/layout-w1024dp/other_setting_popup.xml
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/dialog_top_holo_dark"
-            android:minHeight="48dip">
+            android:minHeight="48dp">
         <TextView android:id="@+id/title"
                 android:text="@string/pref_camera_settings_category"
                 style="@style/SettingTitleText" />
diff --git a/res/layout-sw485dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index b054299..221ec2c 100644
--- a/res/layout-sw485dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -17,9 +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_marginLeft="5dp"
-        android:layout_marginTop="5dp">
+        android:layout_toLeftOf="@id/control_panel">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/res/layout-sw485dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index dd003af..6757553 100644
--- a/res/layout-sw485dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -18,9 +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_marginLeft="5dp"
-        android:layout_marginTop="5dp">
+        android:layout_toLeftOf="@id/control_panel">
     <RelativeLayout android:id="@+id/frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/res/layout-sw485dp/review_control.xml b/res/layout-w1024dp/review_control.xml
index 63415d3..63415d3 100644
--- a/res/layout-sw485dp/review_control.xml
+++ b/res/layout-w1024dp/review_control.xml
diff --git a/res/layout-sw485dp/review_thumbnail.xml b/res/layout-w1024dp/review_thumbnail.xml
index ce17517..ce17517 100644
--- a/res/layout-sw485dp/review_thumbnail.xml
+++ b/res/layout-w1024dp/review_thumbnail.xml
diff --git a/res/layout-sw485dp/setting_item.xml b/res/layout-w1024dp/setting_item.xml
index 43e6271..43e6271 100644
--- a/res/layout-sw485dp/setting_item.xml
+++ b/res/layout-w1024dp/setting_item.xml
diff --git a/res/layout-sw485dp/setting_scale_image_item.xml b/res/layout-w1024dp/setting_scale_image_item.xml
index c5988fb..c5988fb 100644
--- a/res/layout-sw485dp/setting_scale_image_item.xml
+++ b/res/layout-w1024dp/setting_scale_image_item.xml
diff --git a/res/layout-sw485dp/video_camera.xml b/res/layout-w1024dp/video_camera.xml
index afe0408..afe0408 100644
--- a/res/layout-sw485dp/video_camera.xml
+++ b/res/layout-w1024dp/video_camera.xml
diff --git a/res/layout-sw485dp/video_camera_attach.xml b/res/layout-w1024dp/video_camera_attach.xml
index 958f72c..958f72c 100644
--- a/res/layout-sw485dp/video_camera_attach.xml
+++ b/res/layout-w1024dp/video_camera_attach.xml
diff --git a/res/layout-sw485dp/zoom_picker.xml b/res/layout-w1024dp/zoom_picker.xml
index 274ba5c..e4a2808 100644
--- a/res/layout-sw485dp/zoom_picker.xml
+++ b/res/layout-w1024dp/zoom_picker.xml
@@ -35,7 +35,7 @@
     <Button android:id="@+id/increment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="48dp"
+            android:layout_marginLeft="@dimen/zoom_picker_distance"
             android:enabled="false"
             android:background="@drawable/btn_zoom_in" />
 </com.android.camera.ui.ZoomPicker>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
deleted file mode 100644
index ea239e1..0000000
--- a/res/values-land/dimens.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<resources>
-</resources>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
new file mode 100644
index 0000000..cb34a3c
--- /dev/null
+++ b/res/values-w1024dp/dimens.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/dimens.xml
+**
+** Copyright 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.
+*/
+-->
+<resources>
+    <dimen name="camera_control_width">245dp</dimen>
+    <dimen name="zoom_picker_margin_top">16dp</dimen>
+    <dimen name="zoom_picker_margin_right">36dp</dimen>
+    <dimen name="zoom_picker_distance">44dp</dimen>
+    <dimen name="mode_switcher_margin_right">5dp</dimen>
+    <dimen name="mode_switcher_margin_bottom">21dp</dimen>
+    <dimen name="mode_switcher_inner_margin">10dp</dimen>
+    <dimen name="camera_switcher_margin_right">16dp</dimen>
+    <dimen name="camera_switcher_margin_bottom">24dp</dimen>
+</resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-w1024dp/styles.xml
index f75819b..f75819b 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-w1024dp/styles.xml
diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml
new file mode 100644
index 0000000..d6d7443
--- /dev/null
+++ b/res/values-w1280dp/dimens.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/dimens.xml
+**
+** Copyright 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.
+*/
+-->
+<resources>
+    <dimen name="camera_control_width">295dp</dimen>
+    <dimen name="zoom_picker_margin_top">48dp</dimen>
+    <dimen name="zoom_picker_margin_right">32dp</dimen>
+    <dimen name="zoom_picker_distance">48dp</dimen>
+    <dimen name="mode_switcher_margin_right">34dp</dimen>
+    <dimen name="mode_switcher_margin_bottom">50dp</dimen>
+    <dimen name="mode_switcher_inner_padding">15dp</dimen>
+    <dimen name="camera_switcher_margin_right">30dp</dimen>
+    <dimen name="camera_switcher_margin_bottom">56dp</dimen>
+</resources>