resolved conflicts for merge of e293317f to master

Change-Id: I395d7d596414d118ebb788ef5a46e052785935a7

45 files changed, 6 insertions, 5 deletions

diff --git a/res/drawable-xlarge/btn_ic_camera_shutter.xml b/res/drawable-sw485dp/btn_ic_camera_shutter.xml
index aa98917..aa98917 100644
--- a/res/drawable-xlarge/btn_ic_camera_shutter.xml
+++ b/res/drawable-sw485dp/btn_ic_camera_shutter.xml
diff --git a/res/drawable-xlarge-mdpi/btn_ic_mode_switch_camera.xml b/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml
index e0e4952..e0e4952 100644
--- a/res/drawable-xlarge-mdpi/btn_ic_mode_switch_camera.xml
+++ b/res/drawable-sw485dp/btn_ic_mode_switch_camera.xml
diff --git a/res/drawable-xlarge-mdpi/btn_ic_mode_switch_video.xml b/res/drawable-sw485dp/btn_ic_mode_switch_video.xml
index 018dcfc..018dcfc 100644
--- a/res/drawable-xlarge-mdpi/btn_ic_mode_switch_video.xml
+++ b/res/drawable-sw485dp/btn_ic_mode_switch_video.xml
diff --git a/res/drawable-xlarge-mdpi/btn_ic_review_play.png b/res/drawable-sw485dp/btn_ic_review_play.png
index 6eca85c..6eca85c 100755
--- a/res/drawable-xlarge-mdpi/btn_ic_review_play.png
+++ b/res/drawable-sw485dp/btn_ic_review_play.png
diff --git a/res/drawable-xlarge-mdpi/btn_ic_video_record_stop.png b/res/drawable-sw485dp/btn_ic_video_record_stop.png
index b123eaf..b123eaf 100755
--- a/res/drawable-xlarge-mdpi/btn_ic_video_record_stop.png
+++ b/res/drawable-sw485dp/btn_ic_video_record_stop.png
diff --git a/res/drawable-xlarge/btn_review_control.xml b/res/drawable-sw485dp/btn_review_control.xml
index 1dd81ca..1dd81ca 100644
--- a/res/drawable-xlarge/btn_review_control.xml
+++ b/res/drawable-sw485dp/btn_review_control.xml
diff --git a/res/drawable-xlarge/btn_shutter.xml b/res/drawable-sw485dp/btn_shutter.xml
index d1772ae..d1772ae 100644
--- a/res/drawable-xlarge/btn_shutter.xml
+++ b/res/drawable-sw485dp/btn_shutter.xml
diff --git a/res/drawable-xlarge/btn_shutter_recording.xml b/res/drawable-sw485dp/btn_shutter_recording.xml
index c2a07ff..c2a07ff 100644
--- a/res/drawable-xlarge/btn_shutter_recording.xml
+++ b/res/drawable-sw485dp/btn_shutter_recording.xml
diff --git a/res/drawable-xlarge/btn_zoom_in.xml b/res/drawable-sw485dp/btn_zoom_in.xml
index d798b5a..d798b5a 100644
--- a/res/drawable-xlarge/btn_zoom_in.xml
+++ b/res/drawable-sw485dp/btn_zoom_in.xml
diff --git a/res/drawable-xlarge/btn_zoom_out.xml b/res/drawable-sw485dp/btn_zoom_out.xml
index 925327d..925327d 100644
--- a/res/drawable-xlarge/btn_zoom_out.xml
+++ b/res/drawable-sw485dp/btn_zoom_out.xml
diff --git a/res/drawable-xlarge-mdpi/button_camera_shutter_holo.png b/res/drawable-sw485dp/button_camera_shutter_holo.png
index 556c921..556c921 100644
--- a/res/drawable-xlarge-mdpi/button_camera_shutter_holo.png
+++ b/res/drawable-sw485dp/button_camera_shutter_holo.png
diff --git a/res/drawable-xlarge-mdpi/button_camera_shutter_pressed_holo.png b/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png
index 7ccc389..7ccc389 100644
--- a/res/drawable-xlarge-mdpi/button_camera_shutter_pressed_holo.png
+++ b/res/drawable-sw485dp/button_camera_shutter_pressed_holo.png
diff --git a/res/drawable-xlarge-mdpi/button_ic_camera_shutter.png b/res/drawable-sw485dp/button_ic_camera_shutter.png
index 34a36af..34a36af 100644
--- a/res/drawable-xlarge-mdpi/button_ic_camera_shutter.png
+++ b/res/drawable-sw485dp/button_ic_camera_shutter.png
diff --git a/res/drawable-xlarge-mdpi/button_ic_camera_shutter_pressed.png b/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png
index baa0c3f..baa0c3f 100644
--- a/res/drawable-xlarge-mdpi/button_ic_camera_shutter_pressed.png
+++ b/res/drawable-sw485dp/button_ic_camera_shutter_pressed.png
diff --git a/res/drawable-xlarge-mdpi/button_video_shutter_holo.png b/res/drawable-sw485dp/button_video_shutter_holo.png
index 8c8b4df..8c8b4df 100644
--- a/res/drawable-xlarge-mdpi/button_video_shutter_holo.png
+++ b/res/drawable-sw485dp/button_video_shutter_holo.png
diff --git a/res/drawable-xlarge-mdpi/button_video_shutter_pressed_holo.png b/res/drawable-sw485dp/button_video_shutter_pressed_holo.png
index 903a57a..903a57a 100644
--- a/res/drawable-xlarge-mdpi/button_video_shutter_pressed_holo.png
+++ b/res/drawable-sw485dp/button_video_shutter_pressed_holo.png
diff --git a/res/drawable-xlarge-mdpi/ic_time_lapse_holo_dark.png b/res/drawable-sw485dp/ic_time_lapse_holo_dark.png
index 2bb9c57..2bb9c57 100644
--- a/res/drawable-xlarge-mdpi/ic_time_lapse_holo_dark.png
+++ b/res/drawable-sw485dp/ic_time_lapse_holo_dark.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_coloreffect.png b/res/drawable-sw485dp/ic_viewfinder_coloreffect.png
index 738ef05..738ef05 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_coloreffect.png
+++ b/res/drawable-sw485dp/ic_viewfinder_coloreffect.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_auto.png b/res/drawable-sw485dp/ic_viewfinder_flash_auto.png
index 7b1cb6c..7b1cb6c 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_auto.png
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_off.png b/res/drawable-sw485dp/ic_viewfinder_flash_off.png
index ecf8220..ecf8220 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_off.png
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_off.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_on.png b/res/drawable-sw485dp/ic_viewfinder_flash_on.png
index c01a882..c01a882 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_flash_on.png
+++ b/res/drawable-sw485dp/ic_viewfinder_flash_on.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_scene_mode.png b/res/drawable-sw485dp/ic_viewfinder_scene_mode.png
index d11b057..d11b057 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_scene_mode.png
+++ b/res/drawable-sw485dp/ic_viewfinder_scene_mode.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_settings.png b/res/drawable-sw485dp/ic_viewfinder_settings.png
index 3093ed7..3093ed7 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_settings.png
+++ b/res/drawable-sw485dp/ic_viewfinder_settings.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_share.png b/res/drawable-sw485dp/ic_viewfinder_share.png
index d8f223a..d8f223a 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_share.png
+++ b/res/drawable-sw485dp/ic_viewfinder_share.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_high.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png
index 2fcbd8b..2fcbd8b 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_high.png
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_low.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png
index 9158059..9158059 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_low.png
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png
index 7d279af..7d279af 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_video_quality_youtube.png
+++ b/res/drawable-sw485dp/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_auto.png b/res/drawable-sw485dp/ic_viewfinder_wb_auto.png
index cf8ddb4..cf8ddb4 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_auto.png
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_daylight.png b/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png
index 6472b09..6472b09 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_daylight.png
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png
index 509f436..509f436 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_fluorescent.png
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png
index 1ef4d2e..1ef4d2e 100644
--- a/res/drawable-xlarge-mdpi/ic_viewfinder_wb_incandescent.png
+++ b/res/drawable-sw485dp/ic_viewfinder_wb_incandescent.png
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-sw485dp/basic_setting_popup.xml
index 06561a0..06561a0 100644
--- a/res/layout-xlarge/basic_setting_popup.xml
+++ b/res/layout-sw485dp/basic_setting_popup.xml
diff --git a/res/layout-xlarge/camera.xml b/res/layout-sw485dp/camera.xml
index 6b327b0..6b327b0 100644
--- a/res/layout-xlarge/camera.xml
+++ b/res/layout-sw485dp/camera.xml
diff --git a/res/layout-xlarge/camera_attach.xml b/res/layout-sw485dp/camera_attach.xml
index 6b327b0..6b327b0 100644
--- a/res/layout-xlarge/camera_attach.xml
+++ b/res/layout-sw485dp/camera_attach.xml
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-sw485dp/camera_control.xml
index ac7494e..78aca3d 100644
--- a/res/layout-xlarge/camera_control.xml
+++ b/res/layout-sw485dp/camera_control.xml
@@ -16,8 +16,9 @@
 
 <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="325dp"
+        android:layout_width="302dp"
         android:layout_alignParentRight="true">
         <!-- The width is determined by IndicatorWheel so we should set
              layout_width as wrap_contant but RelativeLayout Javadoc says that
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-sw485dp/in_line_setting_picker.xml
index f4ba7a4..f4ba7a4 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-sw485dp/in_line_setting_picker.xml
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-sw485dp/other_setting_popup.xml
index 09744d6..09744d6 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-sw485dp/other_setting_popup.xml
diff --git a/res/layout-xlarge/preview_frame.xml b/res/layout-sw485dp/preview_frame.xml
index 96f133d..7f64286 100644
--- a/res/layout-xlarge/preview_frame.xml
+++ b/res/layout-sw485dp/preview_frame.xml
@@ -15,9 +15,9 @@
 -->
 <com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_layout"
-        android:layout_width="978dp"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@id/control_panel"
         android:layout_marginLeft="5dp"
         android:layout_marginTop="5dp">
     <RelativeLayout android:id="@+id/frame"
diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-sw485dp/preview_frame_video.xml
index e8edb41..115383d 100644
--- a/res/layout-xlarge/preview_frame_video.xml
+++ b/res/layout-sw485dp/preview_frame_video.xml
@@ -16,9 +16,9 @@
 
 <com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/frame_layout"
-        android:layout_width="978dp"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@id/control_panel"
         android:layout_marginLeft="5dp"
         android:layout_marginTop="5dp">
     <RelativeLayout android:id="@+id/frame"
diff --git a/res/layout-xlarge/review_control.xml b/res/layout-sw485dp/review_control.xml
index 63415d3..63415d3 100644
--- a/res/layout-xlarge/review_control.xml
+++ b/res/layout-sw485dp/review_control.xml
diff --git a/res/layout-xlarge/review_thumbnail.xml b/res/layout-sw485dp/review_thumbnail.xml
index 7e7eb62..7e7eb62 100644
--- a/res/layout-xlarge/review_thumbnail.xml
+++ b/res/layout-sw485dp/review_thumbnail.xml
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-sw485dp/setting_item.xml
index 43e6271..43e6271 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-sw485dp/setting_item.xml
diff --git a/res/layout-xlarge/video_camera.xml b/res/layout-sw485dp/video_camera.xml
index afe0408..afe0408 100644
--- a/res/layout-xlarge/video_camera.xml
+++ b/res/layout-sw485dp/video_camera.xml
diff --git a/res/layout-xlarge/video_camera_attach.xml b/res/layout-sw485dp/video_camera_attach.xml
index 958f72c..958f72c 100644
--- a/res/layout-xlarge/video_camera_attach.xml
+++ b/res/layout-sw485dp/video_camera_attach.xml
diff --git a/res/layout-xlarge/zoom_picker.xml b/res/layout-sw485dp/zoom_picker.xml
index 274ba5c..274ba5c 100644
--- a/res/layout-xlarge/zoom_picker.xml
+++ b/res/layout-sw485dp/zoom_picker.xml