Make PreviewFrameLayout and ControlPanelLayout work in potrait mode.

+ Move tablet resource to sw600dp and sw800dp

bug:5446617

Change-Id: Iaf2a442e621ed071d7639972a529dd263e3ce628

178 files changed, 53 insertions, 21 deletions

diff --git a/res/drawable-w1024dp-hdpi/bg_camera_pattern.png b/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
index fff5d52..fff5d52 100644
--- a/res/drawable-w1024dp-hdpi/bg_camera_pattern.png
+++ b/res/drawable-sw600dp-hdpi/bg_camera_pattern.png
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
index 0661b2e..0661b2e 100644
--- a/res/drawable-w1024dp-hdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
index 9926f39..9926f39 100644
--- a/res/drawable-w1024dp-hdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_close_settings.png b/res/drawable-sw600dp-hdpi/btn_close_settings.png
index 0172abf..0172abf 100644
--- a/res/drawable-w1024dp-hdpi/btn_close_settings.png
+++ b/res/drawable-sw600dp-hdpi/btn_close_settings.png
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
index 19436d4..19436d4 100644
--- a/res/drawable-w1024dp-hdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
index 1f0bc53..1f0bc53 100644
--- a/res/drawable-w1024dp-hdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
index e2b70bc..e2b70bc 100644
--- a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_holo.png
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
index fb6b9f6..fb6b9f6 100644
--- a/res/drawable-w1024dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
index a812971..a812971 100644
--- a/res/drawable-w1024dp-hdpi/btn_retake_shutter_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_retake_shutter_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
index b3e852b..b3e852b 100644
--- a/res/drawable-w1024dp-hdpi/btn_retake_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_retake_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
index 113cbb1..113cbb1 100644
--- a/res/drawable-w1024dp-hdpi/btn_video_shutter_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
index f5eaab6..f5eaab6 100644
--- a/res/drawable-w1024dp-hdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
index 9e8ed18..9e8ed18 100644
--- a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_holo.png
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
index c1729ab..c1729ab 100644
--- a/res/drawable-w1024dp-hdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-hdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
index eac6dba..eac6dba 100644
--- a/res/drawable-w1024dp-hdpi/ic_effects_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_effects_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
index ee45cfc..ee45cfc 100644
--- a/res/drawable-w1024dp-hdpi/ic_exposure_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_exposure_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
index 00caf1b..00caf1b 100644
--- a/res/drawable-w1024dp-hdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_flash_auto_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
index 353df48..353df48 100644
--- a/res/drawable-w1024dp-hdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_flash_off_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
index b508318..b508318 100644
--- a/res/drawable-w1024dp-hdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_flash_on_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_gallery.png b/res/drawable-sw600dp-hdpi/ic_gallery.png
index 12f586a..12f586a 100644
--- a/res/drawable-w1024dp-hdpi/ic_gallery.png
+++ b/res/drawable-sw600dp-hdpi/ic_gallery.png
diff --git a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png b/res/drawable-sw600dp-hdpi/ic_menu_overflow.png
index a7bdbeb..a7bdbeb 100644
--- a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png
+++ b/res/drawable-sw600dp-hdpi/ic_menu_overflow.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
index b0df823..b0df823 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_border_fast.9.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_border_fast.9.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
index 60d1f98..60d1f98 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
index 244118f..244118f 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_left_indicator_fast.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_left_indicator_fast.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_progression.png b/res/drawable-sw600dp-hdpi/ic_pan_progression.png
index afe9188..afe9188 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_progression.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
index f9b2ca2..f9b2ca2 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
index e57f010..e57f010 100644
--- a/res/drawable-w1024dp-hdpi/ic_pan_right_indicator_fast.png
+++ b/res/drawable-sw600dp-hdpi/ic_pan_right_indicator_fast.png
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_1080p.png b/res/drawable-sw600dp-hdpi/ic_quality_1080p.png
index 8800ada..8800ada 100644
--- a/res/drawable-w1024dp-hdpi/ic_quality_1080p.png
+++ b/res/drawable-sw600dp-hdpi/ic_quality_1080p.png
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_480p.png b/res/drawable-sw600dp-hdpi/ic_quality_480p.png
index 8140410..8140410 100644
--- a/res/drawable-w1024dp-hdpi/ic_quality_480p.png
+++ b/res/drawable-sw600dp-hdpi/ic_quality_480p.png
diff --git a/res/drawable-w1024dp-hdpi/ic_quality_720p.png b/res/drawable-sw600dp-hdpi/ic_quality_720p.png
index a3d7598..a3d7598 100644
--- a/res/drawable-w1024dp-hdpi/ic_quality_720p.png
+++ b/res/drawable-sw600dp-hdpi/ic_quality_720p.png
diff --git a/res/drawable-w1024dp-hdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
index e0dd705..e0dd705 100644
--- a/res/drawable-w1024dp-hdpi/ic_scn_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_scn_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
index 13c9991..13c9991 100644
--- a/res/drawable-w1024dp-hdpi/ic_settings_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_settings_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
index 291d36b..291d36b 100644
--- a/res/drawable-w1024dp-hdpi/ic_snapshot_border.9.png
+++ b/res/drawable-sw600dp-hdpi/ic_snapshot_border.9.png
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
index a415e8c..a415e8c 100644
--- a/res/drawable-w1024dp-hdpi/ic_switch_photo_facing_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_switch_photo_facing_holo_light.png
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
index 743aea3..743aea3 100644
--- a/res/drawable-w1024dp-hdpi/ic_switch_video_facing_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_switch_video_facing_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1.png
index f4b788e..f4b788e 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_1.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_1.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_10.png b/res/drawable-sw600dp-hdpi/ic_timelapse_10.png
index fae0820..fae0820 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_10.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_10.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
index 9a2232c..9a2232c 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_1_5.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_1_5.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2.png
index dbb59df..dbb59df 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_2.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_2.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
index 41245f6..41245f6 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_2_5.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_2_5.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_3.png b/res/drawable-sw600dp-hdpi/ic_timelapse_3.png
index b3dd3c5..b3dd3c5 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_3.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_3.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_5.png b/res/drawable-sw600dp-hdpi/ic_timelapse_5.png
index 38a7279..38a7279 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_5.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_5.png
diff --git a/res/drawable-w1024dp-hdpi/ic_timelapse_none.png b/res/drawable-sw600dp-hdpi/ic_timelapse_none.png
index 33e462f..33e462f 100644
--- a/res/drawable-w1024dp-hdpi/ic_timelapse_none.png
+++ b/res/drawable-sw600dp-hdpi/ic_timelapse_none.png
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
index dc5efea..dc5efea 100644
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_auto_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_auto_holo_light.png
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
index 9bf242d..9bf242d 100644
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_cloudy_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_cloudy_holo_light.png
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
index 1c2d104..1c2d104 100644
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_fluorescent_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_fluorescent_holo_light.png
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
index b3a0393..b3a0393 100644
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_incandescent_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_incandescent_holo_light.png
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
index 37212aa..37212aa 100644
--- a/res/drawable-w1024dp-hdpi/ic_white_balance_sunlight_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_white_balance_sunlight_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
index b90d1ac..b90d1ac 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_zoom_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
index 99d5ef4..99d5ef4 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_dark.png
+++ b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_dark.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
index 42c0a75..42c0a75 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
index 5fa4c95..5fa4c95 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_dark.png
+++ b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
index 5a8eac8..5a8eac8 100644
--- a/res/drawable-w1024dp-hdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-sw600dp-hdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/bg_camera_pattern.png b/res/drawable-sw600dp-mdpi/bg_camera_pattern.png
index 7b120f6..7b120f6 100644
--- a/res/drawable-w1024dp-mdpi/bg_camera_pattern.png
+++ b/res/drawable-sw600dp-mdpi/bg_camera_pattern.png
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
index edb317b..edb317b 100644
--- a/res/drawable-w1024dp-mdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
index 895be4b..895be4b 100644
--- a/res/drawable-w1024dp-mdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_close_settings.png b/res/drawable-sw600dp-mdpi/btn_close_settings.png
index d876ac8..d876ac8 100644
--- a/res/drawable-w1024dp-mdpi/btn_close_settings.png
+++ b/res/drawable-sw600dp-mdpi/btn_close_settings.png
diff --git a/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml b/res/drawable-sw600dp-mdpi/btn_ic_camera_shutter.xml
index aa98917..aa98917 100644
--- a/res/drawable-w1024dp-mdpi/btn_ic_camera_shutter.xml
+++ b/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
index 5331634..5331634 100644
--- a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_camera.xml
+++ b/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
index c61f2ec..c61f2ec 100644
--- a/res/drawable-w1024dp-mdpi/btn_ic_mode_switch_video.xml
+++ b/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
index 84431fa..84431fa 100644
--- a/res/drawable-w1024dp-mdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
index 1e52be8..1e52be8 100644
--- a/res/drawable-w1024dp-mdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
index 693fee2..693fee2 100644
--- a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_holo.png
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
index d503fda..d503fda 100644
--- a/res/drawable-w1024dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
index c292d59..c292d59 100644
--- a/res/drawable-w1024dp-mdpi/btn_retake_shutter_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_retake_shutter_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
index fe083ee..fe083ee 100644
--- a/res/drawable-w1024dp-mdpi/btn_retake_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_retake_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_shutter.xml b/res/drawable-sw600dp-mdpi/btn_shutter.xml
index d15f870..d15f870 100644
--- a/res/drawable-w1024dp-mdpi/btn_shutter.xml
+++ b/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
index 6bcf992..6bcf992 100644
--- a/res/drawable-w1024dp-mdpi/btn_video_shutter_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
index 8ccbf4b..8ccbf4b 100644
--- a/res/drawable-w1024dp-mdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
index ab1d6c5..ab1d6c5 100644
--- a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_holo.png
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
index a0b4fb1..a0b4fb1 100644
--- a/res/drawable-w1024dp-mdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-mdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
index 34a36af..34a36af 100644
--- a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter.png
+++ b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter.png
diff --git a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
index baa0c3f..baa0c3f 100644
--- a/res/drawable-w1024dp-mdpi/button_ic_camera_shutter_pressed.png
+++ b/res/drawable-sw600dp-mdpi/button_ic_camera_shutter_pressed.png
diff --git a/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
index 9935f9c..9935f9c 100644
--- a/res/drawable-w1024dp-mdpi/ic_effects_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_effects_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
index 4f4cc74..4f4cc74 100644
--- a/res/drawable-w1024dp-mdpi/ic_exposure_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_exposure_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
index 7dacd20..7dacd20 100644
--- a/res/drawable-w1024dp-mdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_flash_auto_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
index 30b51a5..30b51a5 100644
--- a/res/drawable-w1024dp-mdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_flash_off_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
index 7bc6963..7bc6963 100644
--- a/res/drawable-w1024dp-mdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_flash_on_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_gallery.png b/res/drawable-sw600dp-mdpi/ic_gallery.png
index 9388931..9388931 100644
--- a/res/drawable-w1024dp-mdpi/ic_gallery.png
+++ b/res/drawable-sw600dp-mdpi/ic_gallery.png
diff --git a/res/drawable-w1024dp-mdpi/ic_menu_overflow.png b/res/drawable-sw600dp-mdpi/ic_menu_overflow.png
index f927168..f927168 100644
--- a/res/drawable-w1024dp-mdpi/ic_menu_overflow.png
+++ b/res/drawable-sw600dp-mdpi/ic_menu_overflow.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
index 332441e..332441e 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_border_fast.9.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_border_fast.9.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
index 4579cf7..4579cf7 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
index 68e17c4..68e17c4 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_left_indicator_fast.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_left_indicator_fast.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_progression.png b/res/drawable-sw600dp-mdpi/ic_pan_progression.png
index d75ec8b..d75ec8b 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_progression.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
index de44206..de44206 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
index dd9794d..dd9794d 100644
--- a/res/drawable-w1024dp-mdpi/ic_pan_right_indicator_fast.png
+++ b/res/drawable-sw600dp-mdpi/ic_pan_right_indicator_fast.png
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_1080p.png b/res/drawable-sw600dp-mdpi/ic_quality_1080p.png
index 65ec0c7..65ec0c7 100644
--- a/res/drawable-w1024dp-mdpi/ic_quality_1080p.png
+++ b/res/drawable-sw600dp-mdpi/ic_quality_1080p.png
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_480p.png b/res/drawable-sw600dp-mdpi/ic_quality_480p.png
index 24915f3..24915f3 100644
--- a/res/drawable-w1024dp-mdpi/ic_quality_480p.png
+++ b/res/drawable-sw600dp-mdpi/ic_quality_480p.png
diff --git a/res/drawable-w1024dp-mdpi/ic_quality_720p.png b/res/drawable-sw600dp-mdpi/ic_quality_720p.png
index 28c58eb..28c58eb 100644
--- a/res/drawable-w1024dp-mdpi/ic_quality_720p.png
+++ b/res/drawable-sw600dp-mdpi/ic_quality_720p.png
diff --git a/res/drawable-w1024dp-mdpi/ic_recording_indicator.png b/res/drawable-sw600dp-mdpi/ic_recording_indicator.png
index 9d168f1..9d168f1 100644
--- a/res/drawable-w1024dp-mdpi/ic_recording_indicator.png
+++ b/res/drawable-sw600dp-mdpi/ic_recording_indicator.png
diff --git a/res/drawable-w1024dp-mdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
index 0b3866e..0b3866e 100644
--- a/res/drawable-w1024dp-mdpi/ic_scn_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_scn_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
index 2b89fef..2b89fef 100644
--- a/res/drawable-w1024dp-mdpi/ic_settings_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_settings_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
index 6b76066..6b76066 100644
--- a/res/drawable-w1024dp-mdpi/ic_snapshot_border.9.png
+++ b/res/drawable-sw600dp-mdpi/ic_snapshot_border.9.png
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
index cbb0c83..cbb0c83 100644
--- a/res/drawable-w1024dp-mdpi/ic_switch_photo_facing_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_switch_photo_facing_holo_light.png
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
index bf353d2..bf353d2 100644
--- a/res/drawable-w1024dp-mdpi/ic_switch_video_facing_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_switch_video_facing_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1.png
index 5707841..5707841 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_1.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_1.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_10.png b/res/drawable-sw600dp-mdpi/ic_timelapse_10.png
index da69f4b..da69f4b 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_10.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_10.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
index a2bf827..a2bf827 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_1_5.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_1_5.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2.png
index 83e0ed1..83e0ed1 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_2.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_2.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
index 770a898..770a898 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_2_5.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_2_5.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_3.png b/res/drawable-sw600dp-mdpi/ic_timelapse_3.png
index 9f7cbb2..9f7cbb2 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_3.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_3.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_5.png b/res/drawable-sw600dp-mdpi/ic_timelapse_5.png
index f86780b..f86780b 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_5.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_5.png
diff --git a/res/drawable-w1024dp-mdpi/ic_timelapse_none.png b/res/drawable-sw600dp-mdpi/ic_timelapse_none.png
index 67e36a6..67e36a6 100644
--- a/res/drawable-w1024dp-mdpi/ic_timelapse_none.png
+++ b/res/drawable-sw600dp-mdpi/ic_timelapse_none.png
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
index b8ec090..b8ec090 100644
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_auto_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_auto_holo_light.png
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
index 3dbb1e2..3dbb1e2 100644
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_cloudy_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_cloudy_holo_light.png
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
index a60a97a..a60a97a 100644
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_fluorescent_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_fluorescent_holo_light.png
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
index 8176071..8176071 100644
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_incandescent_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_incandescent_holo_light.png
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
index a5a0ab2..a5a0ab2 100644
--- a/res/drawable-w1024dp-mdpi/ic_white_balance_sunlight_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_white_balance_sunlight_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
index 0917b07..0917b07 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_zoom_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
index fd35207..fd35207 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_dark.png
+++ b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_dark.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
index 3d55439..3d55439 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_in_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_zoom_in_holo_light.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
index e282872..e282872 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_dark.png
+++ b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
index 1a5475b..1a5475b 100644
--- a/res/drawable-w1024dp-mdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-sw600dp-mdpi/ic_zoom_out_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/bg_camera_pattern.png b/res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
index 9ba9994..9ba9994 100644
--- a/res/drawable-w1024dp-xhdpi/bg_camera_pattern.png
+++ b/res/drawable-sw600dp-xhdpi/bg_camera_pattern.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
index 1b1552c..1b1552c 100644
--- a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
index 3d410ad..3d410ad 100644
--- a/res/drawable-w1024dp-xhdpi/btn_camera_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_camera_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_close_settings.png b/res/drawable-sw600dp-xhdpi/btn_close_settings.png
index dcc7f8d..dcc7f8d 100644
--- a/res/drawable-w1024dp-xhdpi/btn_close_settings.png
+++ b/res/drawable-sw600dp-xhdpi/btn_close_settings.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
index 129a549..129a549 100644
--- a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
index f340f04..f340f04 100644
--- a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
index c72ac0c..c72ac0c 100644
--- a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_holo.png
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
index 8c26f82..8c26f82 100644
--- a/res/drawable-w1024dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_pan_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
index 6cae86f..6cae86f 100644
--- a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
index 2120ab1..2120ab1 100644
--- a/res/drawable-w1024dp-xhdpi/btn_retake_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_retake_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
index 4390f66..4390f66 100644
--- a/res/drawable-w1024dp-xhdpi/btn_video_shutter_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_video_shutter_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
index e9fd0c2..e9fd0c2 100644
--- a/res/drawable-w1024dp-xhdpi/btn_video_shutter_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_video_shutter_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
index 746faf8..746faf8 100644
--- a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_holo.png
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
index 26ee6b9..26ee6b9 100644
--- a/res/drawable-w1024dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
+++ b/res/drawable-sw600dp-xhdpi/btn_video_shutter_recording_pressed_holo.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
index 8590a9e..8590a9e 100644
--- a/res/drawable-w1024dp-xhdpi/ic_effects_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_effects_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
index ed73752..ed73752 100644
--- a/res/drawable-w1024dp-xhdpi/ic_exposure_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_exposure_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
index 915f4a5..915f4a5 100644
--- a/res/drawable-w1024dp-xhdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_flash_auto_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
index f34e5a9..f34e5a9 100644
--- a/res/drawable-w1024dp-xhdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_flash_off_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
index b1dbbc0..b1dbbc0 100644
--- a/res/drawable-w1024dp-xhdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_flash_on_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_gallery.png b/res/drawable-sw600dp-xhdpi/ic_gallery.png
index 5bc1a2e..5bc1a2e 100644
--- a/res/drawable-w1024dp-xhdpi/ic_gallery.png
+++ b/res/drawable-sw600dp-xhdpi/ic_gallery.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png b/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
index cd509d2..cd509d2 100644
--- a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png
+++ b/res/drawable-sw600dp-xhdpi/ic_menu_overflow.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png b/res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
index 9eeaa47..9eeaa47 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_border_fast.9.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_border_fast.9.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
index 0bc4d06..0bc4d06 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
index b87cf6c..b87cf6c 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_left_indicator_fast.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_left_indicator_fast.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_progression.png b/res/drawable-sw600dp-xhdpi/ic_pan_progression.png
index 22d8a4e..22d8a4e 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_progression.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_progression.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
index 640e47d..640e47d 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
index b8fc167..b8fc167 100644
--- a/res/drawable-w1024dp-xhdpi/ic_pan_right_indicator_fast.png
+++ b/res/drawable-sw600dp-xhdpi/ic_pan_right_indicator_fast.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_1080p.png b/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
index 0dd9598..0dd9598 100644
--- a/res/drawable-w1024dp-xhdpi/ic_quality_1080p.png
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_1080p.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_480p.png b/res/drawable-sw600dp-xhdpi/ic_quality_480p.png
index 6dab5c4..6dab5c4 100644
--- a/res/drawable-w1024dp-xhdpi/ic_quality_480p.png
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_480p.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_quality_720p.png b/res/drawable-sw600dp-xhdpi/ic_quality_720p.png
index d129bb5..d129bb5 100644
--- a/res/drawable-w1024dp-xhdpi/ic_quality_720p.png
+++ b/res/drawable-sw600dp-xhdpi/ic_quality_720p.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_scn_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
index 4369205..4369205 100644
--- a/res/drawable-w1024dp-xhdpi/ic_scn_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_scn_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
index 9fa8f72..9fa8f72 100644
--- a/res/drawable-w1024dp-xhdpi/ic_settings_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_settings_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png b/res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
index b4e1332..b4e1332 100644
--- a/res/drawable-w1024dp-xhdpi/ic_snapshot_border.9.png
+++ b/res/drawable-sw600dp-xhdpi/ic_snapshot_border.9.png
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
index cf8edf8..cf8edf8 100644
--- a/res/drawable-w1024dp-xhdpi/ic_switch_photo_facing_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_switch_photo_facing_holo_light.png
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
index d48e403..d48e403 100644
--- a/res/drawable-w1024dp-xhdpi/ic_switch_video_facing_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_switch_video_facing_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
index aa89d30..aa89d30 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_1.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_1.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
index 2a1b617..2a1b617 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_10.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_10.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
index 923cec8..923cec8 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_1_5.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_1_5.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
index a701142..a701142 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_2.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_2.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
index c12ecd7..c12ecd7 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_2_5.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_2_5.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
index d3f681f..d3f681f 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_3.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_3.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_5.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
index 1eca86f..1eca86f 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_5.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_5.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png b/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
index ace6b36..ace6b36 100644
--- a/res/drawable-w1024dp-xhdpi/ic_timelapse_none.png
+++ b/res/drawable-sw600dp-xhdpi/ic_timelapse_none.png
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
index cc41997..cc41997 100644
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_auto_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_auto_holo_light.png
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
index b47c796..b47c796 100644
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_cloudy_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_cloudy_holo_light.png
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
index 6792345..6792345 100644
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_fluorescent_holo_light.png
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
index 9d0f1a3..9d0f1a3 100644
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_incandescent_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_incandescent_holo_light.png
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
index 5388a66..5388a66 100644
--- a/res/drawable-w1024dp-xhdpi/ic_white_balance_sunlight_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_white_balance_sunlight_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
index 572294e..572294e 100644
--- a/res/drawable-w1024dp-xhdpi/ic_zoom_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_zoom_holo_light.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
index 34064d7..34064d7 100644
--- a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_dark.png
+++ b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_dark.png
diff --git a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
index 6297de4..6297de4 100644
--- a/res/drawable-w1024dp-xhdpi/ic_zoom_out_holo_light.png
+++ b/res/drawable-sw600dp-xhdpi/ic_zoom_out_holo_light.png
diff --git a/res/layout-w1024dp/camera.xml b/res/layout-sw600dp/camera.xml
index 87ab2c7..87ab2c7 100644
--- a/res/layout-w1024dp/camera.xml
+++ b/res/layout-sw600dp/camera.xml
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-sw600dp/camera_control.xml
index 194547a..194547a 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-sw600dp/camera_control.xml
diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-sw600dp/mode_picker.xml
index a77485d..a77485d 100644
--- a/res/layout-w1024dp/mode_picker.xml
+++ b/res/layout-sw600dp/mode_picker.xml
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml
index 961a407..961a407 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-sw600dp/preview_frame.xml
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml
index 69b7fe3..69b7fe3 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-sw600dp/preview_frame_video.xml
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-sw600dp/review_control.xml
index ad973e8..ad973e8 100644
--- a/res/layout-w1024dp/review_control.xml
+++ b/res/layout-sw600dp/review_control.xml
diff --git a/res/layout-w1024dp/video_camera.xml b/res/layout-sw600dp/video_camera.xml
index 809c7a5..809c7a5 100644
--- a/res/layout-w1024dp/video_camera.xml
+++ b/res/layout-sw600dp/video_camera.xml
diff --git a/res/values-w1024dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 3044e7d..3044e7d 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
diff --git a/res/values-w1024dp/styles.xml b/res/values-sw600dp/styles.xml
index 1e354e2..1e354e2 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
diff --git a/res/values-w1280dp/dimens.xml b/res/values-sw800dp/dimens.xml
index eed865e..eed865e 100644
--- a/res/values-w1280dp/dimens.xml
+++ b/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 com.android.camera.ui.PopupManager;
 
 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 @@ abstract public class ActivityBase extends Activity {
 
     @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 class PreviewFrameLayout extends RelativeLayout {
         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 class Util {
     }
 
     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 @@ import android.widget.RelativeLayout;
  * 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 @@ public class ControlPanelLayout extends RelativeLayout {
     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) {
+        boolean isLandscape = (((Activity) getContext()).getRequestedOrientation()
+                == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+        if (isLandscape) {
+            mode = MeasureSpec.getMode(widthSpec);
+            longSideSize = widthSpecSize;
+            shortSideSize = heightSpecSize;
+            minSize = getSuggestedMinimumWidth();
+            specSize = widthSpecSize;
+        } else {
+            mode = MeasureSpec.getMode(heightSpec);
+            longSideSize = heightSpecSize;
+            shortSideSize = widthSpecSize;
+            minSize = getSuggestedMinimumHeight();
+            specSize = heightSpecSize;
+        }
+
+        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.
-            measuredWidth = (int) (widthSpecSize - heightSpecSize / 3.0 * 4.0 - 16);
+            measuredSize = (int) (longSideSize - shortSideSize / 3.0 * 4.0);
         } else {
-            Log.e(TAG, "layout_width of ControlPanelLayout should be wrap_content");
+            Log.e(TAG, "layout_xxx of ControlPanelLayout should be wrap_content");
         }
 
-        // Make sure the width is bigger than the minimum width.
-        int minWidth = getSuggestedMinimumWidth();
-        if (minWidth > measuredWidth) {
-            measuredWidth = minWidth;
+        // 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;
+        }
+
+        if (isLandscape) {
+            widthSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
+        } else {
+            heightSpec = MeasureSpec.makeMeasureSpec(measuredSize, MeasureSpec.EXACTLY);
         }
 
-        super.onMeasure(MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY),
-                heightSpec);
+        super.onMeasure(widthSpec, heightSpec);
     }
 }