Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.
+ Move tablet resource to sw600dp and sw800dp
bug:5446617
Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628
diff --git a/res/drawable-w1024dp-hdpi/bg_camera_pattern.png b/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-hdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_close_settings.png b/res/drawable-sw600dp-hdpi/btn_close_settings.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_close_settings.png
rename to res/drawable-sw600dp-hdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-hdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_effects_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_gallery.png b/res/drawable-sw600dp-hdpi/ic_gallery.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_gallery.png
rename to res/drawable-sw600dp-hdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png b/res/drawable-sw600dp-hdpi/ic_menu_overflow.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_menu_overflow.png
rename to res/drawable-sw600dp-hdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_progression.png b/res/drawable-sw600dp-hdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-hdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_1080p.png b/res/drawable-sw600dp-hdpi/ic_quality_1080p.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_quality_1080p.png
rename to res/drawable-sw600dp-hdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_480p.png b/res/drawable-sw600dp-hdpi/ic_quality_480p.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_quality_480p.png
rename to res/drawable-sw600dp-hdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_720p.png b/res/drawable-sw600dp-hdpi/ic_quality_720p.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_quality_720p.png
rename to res/drawable-sw600dp-hdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_scn_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_settings_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_1.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_10.png b/res/drawable-sw600dp-hdpi/ic_timelapse_10.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_10.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_2.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_3.png b/res/drawable-sw600dp-hdpi/ic_timelapse_3.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_3.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_5.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_5.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_none.png b/res/drawable-sw600dp-hdpi/ic_timelapse_none.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_timelapse_none.png
rename to res/drawable-sw600dp-hdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/bg_camera_pattern.png b/res/drawable-sw600dp-mdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-mdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_close_settings.png b/res/drawable-sw600dp-mdpi/btn_close_settings.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_close_settings.png
rename to res/drawable-sw600dp-mdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml b/res/drawable-sw600dp-mdpi/btn_ic_camera_shutter.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_camera_shutter.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml b/res/drawable-sw600dp-mdpi/btn_ic_mode_switch_camera.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_mode_switch_camera.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml b/res/drawable-sw600dp-mdpi/btn_ic_mode_switch_video.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml
rename to res/drawable-sw600dp-mdpi/btn_ic_mode_switch_video.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_shutter.xml b/res/drawable-sw600dp-mdpi/btn_shutter.xml
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_shutter.xml
rename to res/drawable-sw600dp-mdpi/btn_shutter.xml
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-mdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png
rename to res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png
rename to res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_effects_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_gallery.png b/res/drawable-sw600dp-mdpi/ic_gallery.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_gallery.png
rename to res/drawable-sw600dp-mdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_menu_overflow.png b/res/drawable-sw600dp-mdpi/ic_menu_overflow.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_menu_overflow.png
rename to res/drawable-sw600dp-mdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_progression.png b/res/drawable-sw600dp-mdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-mdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_1080p.png b/res/drawable-sw600dp-mdpi/ic_quality_1080p.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_quality_1080p.png
rename to res/drawable-sw600dp-mdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_480p.png b/res/drawable-sw600dp-mdpi/ic_quality_480p.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_quality_480p.png
rename to res/drawable-sw600dp-mdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_720p.png b/res/drawable-sw600dp-mdpi/ic_quality_720p.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_quality_720p.png
rename to res/drawable-sw600dp-mdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_recording_indicator.png b/res/drawable-sw600dp-mdpi/ic_recording_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_recording_indicator.png
rename to res/drawable-sw600dp-mdpi/ic_recording_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_scn_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_settings_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_1.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_10.png b/res/drawable-sw600dp-mdpi/ic_timelapse_10.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_10.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_2.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_3.png b/res/drawable-sw600dp-mdpi/ic_timelapse_3.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_3.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_5.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_5.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_none.png b/res/drawable-sw600dp-mdpi/ic_timelapse_none.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_timelapse_none.png
rename to res/drawable-sw600dp-mdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/bg_camera_pattern.png b/res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/bg_camera_pattern.png
rename to res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_close_settings.png b/res/drawable-sw600dp-xhdpi/btn_close_settings.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_close_settings.png
rename to res/drawable-sw600dp-xhdpi/btn_close_settings.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
rename to res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_gallery.png b/res/drawable-sw600dp-xhdpi/ic_gallery.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_gallery.png
rename to res/drawable-sw600dp-xhdpi/ic_gallery.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png b/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_menu_overflow.png
rename to res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_progression.png b/res/drawable-sw600dp-xhdpi/ic_pan_progression.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_progression.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_progression.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png
rename to res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_1080p.png b/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_quality_1080p.png
rename to res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_480p.png b/res/drawable-sw600dp-xhdpi/ic_quality_480p.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_quality_480p.png
rename to res/drawable-sw600dp-xhdpi/ic_quality_480p.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_720p.png b/res/drawable-sw600dp-xhdpi/ic_quality_720p.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_quality_720p.png
rename to res/drawable-sw600dp-xhdpi/ic_quality_720p.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_scn_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png
rename to res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_1.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_10.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_2.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_3.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_5.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_timelapse_none.png
rename to res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
Binary files differ
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
similarity index 100%
rename from res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
rename to res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
Binary files differ
diff --git a/res/layout-w1024dp/camera.xml b/res/layout-sw600dp/camera.xml
similarity index 100%
rename from res/layout-w1024dp/camera.xml
rename to res/layout-sw600dp/camera.xml
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-sw600dp/camera_control.xml
similarity index 100%
rename from res/layout-w1024dp/camera_control.xml
rename to res/layout-sw600dp/camera_control.xml
diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-sw600dp/mode_picker.xml
similarity index 100%
rename from res/layout-w1024dp/mode_picker.xml
rename to res/layout-sw600dp/mode_picker.xml
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml
similarity index 100%
rename from res/layout-w1024dp/preview_frame.xml
rename to res/layout-sw600dp/preview_frame.xml
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml
similarity index 100%
rename from res/layout-w1024dp/preview_frame_video.xml
rename to res/layout-sw600dp/preview_frame_video.xml
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-sw600dp/review_control.xml
similarity index 100%
rename from res/layout-w1024dp/review_control.xml
rename to res/layout-sw600dp/review_control.xml
diff --git a/res/layout-w1024dp/video_camera.xml b/res/layout-sw600dp/video_camera.xml
similarity index 100%
rename from res/layout-w1024dp/video_camera.xml
rename to res/layout-sw600dp/video_camera.xml
diff --git a/res/values-w1024dp/dimens.xml b/res/values-sw600dp/dimens.xml
similarity index 100%
rename from res/values-w1024dp/dimens.xml
rename to res/values-sw600dp/dimens.xml
diff --git a/res/values-w1024dp/styles.xml b/res/values-sw600dp/styles.xml
similarity index 100%
rename from res/values-w1024dp/styles.xml
rename to res/values-sw600dp/styles.xml
diff --git a/res/values-w1280dp/dimens.xml b/res/values-sw800dp/dimens.xml
similarity index 100%
rename from res/values-w1280dp/dimens.xml
rename to res/values-sw800dp/dimens.xml
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index 439f830..711ed8e 100644
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -20,13 +20,14 @@
import android.app.Activity;
import android.app.KeyguardManager;
-import android.view.KeyEvent;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
import android.hardware.Camera;
import android.media.AudioManager;
import android.os.Bundle;
import android.util.Log;
+import android.view.KeyEvent;
/**
* Superclass of Camera and VideoCamera activities.
@@ -41,6 +42,9 @@
@Override
public void onCreate(Bundle icicle) {
+ if (Util.isTabletUI()) {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ }
super.onCreate(icicle);
setVolumeControlStream(AudioManager.STREAM_MUSIC);
}
diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java
index 5d31e2b..8429259 100644
--- a/src/com/android/camera/PreviewFrameLayout.java
+++ b/src/com/android/camera/PreviewFrameLayout.java
@@ -16,10 +16,9 @@
package com.android.camera;
-import com.android.camera.R;
-
+import android.app.Activity;
import android.content.Context;
-import android.graphics.Rect;
+import android.content.pm.ActivityInfo;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
/**
@@ -31,14 +30,21 @@
public void onSizeChanged();
}
- private double mAspectRatio = 4.0 / 3.0;
+ private double mAspectRatio;
public PreviewFrameLayout(Context context, AttributeSet attrs) {
super(context, attrs);
+ setAspectRatio(4.0 / 3.0);
}
public void setAspectRatio(double ratio) {
if (ratio <= 0.0) throw new IllegalArgumentException();
+
+ if (((Activity) getContext()).getRequestedOrientation()
+ == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+ ratio = 1 / ratio;
+ }
+
if (mAspectRatio != ratio) {
mAspectRatio = ratio;
requestLayout();
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 4c28e56..21d97c3 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -90,7 +90,7 @@
}
public static void initialize(Context context) {
- sIsTabletUI = (context.getResources().getConfiguration().screenWidthDp >= 1024);
+ sIsTabletUI = (context.getResources().getConfiguration().smallestScreenWidthDp >= 600);
DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager)
diff --git a/src/com/android/camera/ui/ControlPanelLayout.java b/src/com/android/camera/ui/ControlPanelLayout.java
index f85d955..c6ab99f 100644
--- a/src/com/android/camera/ui/ControlPanelLayout.java
+++ b/src/com/android/camera/ui/ControlPanelLayout.java
@@ -16,7 +16,9 @@
package com.android.camera.ui;
+import android.app.Activity;
import android.content.Context;
+import android.content.pm.ActivityInfo;
import android.util.AttributeSet;
import android.util.Log;
import android.widget.RelativeLayout;
@@ -25,8 +27,7 @@
* A layout which handles the the width of the control panel, which contains
* the shutter button, thumbnail, front/back camera picker, and mode picker.
* The purpose of this is to have a consistent width of control panel in camera,
- * camcorder, and panorama modes. The control panel can also be GONE and the
- * preview can expand to full-screen in panorama.
+ * camcorder, and panorama modes.
*/
public class ControlPanelLayout extends RelativeLayout {
private static final String TAG = "ControlPanelLayout";
@@ -39,29 +40,50 @@
protected void onMeasure(int widthSpec, int heightSpec) {
int widthSpecSize = MeasureSpec.getSize(widthSpec);
int heightSpecSize = MeasureSpec.getSize(heightSpec);
- int widthMode = MeasureSpec.getMode(widthSpec);
- int measuredWidth = 0;
+ int measuredSize = 0;
+ int mode, longSideSize, shortSideSize, minSize, specSize;
- if (widthSpecSize > 0 && heightSpecSize > 0 && widthMode == MeasureSpec.AT_MOST) {
- // Calculate how big 4:3 preview occupies. Then deduct it from the
- // width of the parent.
- measuredWidth = (int) (widthSpecSize - heightSpecSize / 3.0 * 4.0 - 16);
+ boolean isLandscape = (((Activity) getContext()).getRequestedOrientation()
+ == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+ if (isLandscape) {
+ mode = MeasureSpec.getMode(widthSpec);
+ longSideSize = widthSpecSize;
+ shortSideSize = heightSpecSize;
+ minSize = getSuggestedMinimumWidth();
+ specSize = widthSpecSize;
} else {
- Log.e(TAG, "layout_width of ControlPanelLayout should be wrap_content");
+ mode = MeasureSpec.getMode(heightSpec);
+ longSideSize = heightSpecSize;
+ shortSideSize = widthSpecSize;
+ minSize = getSuggestedMinimumHeight();
+ specSize = heightSpecSize;
}
- // Make sure the width is bigger than the minimum width.
- int minWidth = getSuggestedMinimumWidth();
- if (minWidth > measuredWidth) {
- measuredWidth = minWidth;
+ if (widthSpecSize > 0 && heightSpecSize > 0 && mode == MeasureSpec.AT_MOST) {
+ // Calculate how big 4:3 preview occupies. Then deduct it from the
+ // width of the parent.
+ measuredSize = (int) (longSideSize - shortSideSize / 3.0 * 4.0);
+ } else {
+ Log.e(TAG, "layout_xxx of ControlPanelLayout should be wrap_content");
+ }
+
+ // Make sure the width is bigger than the minimum length.
+ if (minSize > measuredSize) {
+ measuredSize = minSize;
}
// The width cannot be bigger than the constraint.
- if (widthMode == MeasureSpec.AT_MOST && measuredWidth > widthSpecSize) {
- measuredWidth = widthSpecSize;
+ if (mode == MeasureSpec.AT_MOST && measuredSize > specSize) {
+ measuredSize = specSize;
}
- super.onMeasure(MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY),
- heightSpec);
+ if (isLandscape) {
+ widthSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
+ } else {
+ heightSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
+ }
+
+ super.onMeasure(widthSpec, heightSpec);
}
}
