summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrizzoli <joey@cyanogenmoditalia.it>2016-01-07 21:07:51 +0100
committerArne Coucheron <arco68@gmail.com>2018-01-26 01:08:31 +0100
commita0df98edb234a6f4702e1f01df3b67a243103fd1 (patch)
tree240fbe0144590ffc7bd62dbf201803155dd2ad54
parent026807dfd5e0b97eef54b24975937b0d038bdbb5 (diff)
downloadandroid_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.zip
android_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.tar.gz
android_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.tar.bz2
Snap: initial materialization
Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
-rw-r--r--res/drawable-hdpi/ic_hdr.pngbin2889 -> 252 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_off.pngbin4078 -> 380 bytes
-rw-r--r--res/drawable-hdpi/ic_location.pngbin2682 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_location_off.pngbin3370 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_sce.pngbin3237 -> 297 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_action.pngbin4450 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_night.pngbin3497 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_off.pngbin4202 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_party.pngbin4481 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_sunset.pngbin3286 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_antishake.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_auto.pngbin3987 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_backlight.pngbin4783 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_beach.pngbin4596 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_candlelight.pngbin3531 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_flower.pngbin3981 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_hdr.pngbin3967 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_landscape.pngbin2642 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_night.pngbin3350 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_portrait.pngbin2976 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_smartauto.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_snow.pngbin5358 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_sports.pngbin4411 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_sunset.pngbin3299 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_scene_mode_text.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings.pngbin12892 -> 109 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_continuous.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_countdowntimer.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_duration.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_exposure.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_facerec.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_filter.pngbin2157 -> 486 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_focus.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_fps.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_iso.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_lightsource.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_location.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_picturesize.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_quality.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_redeye.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_scenemode.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_storage.pngbin12892 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_back.pngbin1346 -> 224 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_camera.pngbin4685 -> 364 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_front.pngbin1346 -> 274 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_pan.pngbin1851 -> 273 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_video.pngbin3393 -> 173 bytes
-rw-r--r--res/drawable-hdpi/ic_timer.pngbin3331 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_button_stop.pngbin20190 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_button_video.pngbin6536 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_button_video_dim.pngbin6077 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_button_video_stop.pngbin5874 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_panorama.pngbin10742 -> 0 bytes
-rw-r--r--res/drawable-hdpi/shutter_panorama_dim.pngbin6051 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr.pngbin1935 -> 147 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_off.pngbin2566 -> 230 bytes
-rw-r--r--res/drawable-mdpi/ic_location.pngbin1744 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_location_off.pngbin2149 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_sce.pngbin2052 -> 218 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_action.pngbin2688 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_night.pngbin2188 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_off.pngbin2501 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_party.pngbin2544 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_sunset.pngbin2078 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_antishake.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_auto.pngbin1398 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_backlight.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_beach.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_candlelight.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_flower.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_hdr.pngbin2349 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_landscape.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_night.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_portrait.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_smartauto.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_snow.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_sports.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_sunset.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_scene_mode_text.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings.pngbin6394 -> 87 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_continuous.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_countdowntimer.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_duration.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_exposure.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_facerec.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_focus.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_fps.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_iso.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_lightsource.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_location.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_picturesize.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_quality.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_redeye.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_scenemode.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_storage.pngbin6394 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_back.pngbin2179 -> 164 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_camera.pngbin2862 -> 240 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_front.pngbin2512 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_pan.pngbin1461 -> 185 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_video.pngbin2145 -> 131 bytes
-rw-r--r--res/drawable-mdpi/ic_timer.pngbin2171 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_button_stop.pngbin18692 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_button_video.pngbin5088 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_button_video_dim.pngbin4712 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_button_video_stop.pngbin4578 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_panorama.pngbin6017 -> 0 bytes
-rw-r--r--res/drawable-mdpi/shutter_panorama_dim.pngbin4723 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr.pngbin4022 -> 191 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_off.pngbin5860 -> 288 bytes
-rw-r--r--res/drawable-xhdpi/ic_location.pngbin3712 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_location_off.pngbin4792 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce.pngbin4808 -> 355 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_action.pngbin6537 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_night.pngbin4969 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_off.pngbin6262 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_party.pngbin6658 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_sunset.pngbin4676 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_antishake.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_auto.pngbin5312 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_backlight.pngbin6470 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_beach.pngbin6383 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_candlelight.pngbin4776 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_flower.pngbin5370 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_hdr.pngbin5534 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_landscape.pngbin3630 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_night.pngbin4488 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_portrait.pngbin3928 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_smartauto.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_snow.pngbin7195 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_sports.pngbin6352 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_sunset.pngbin4230 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_scene_mode_text.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings.pngbin23597 -> 93 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_continuous.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_countdowntimer.pngbin4636 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_duration.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_exposure.pngbin5936 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_facerec.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_filter.pngbin2592 -> 619 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_focus.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_fps.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_iso.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_lightsource.pngbin5057 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_location.pngbin3712 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_picturesize.pngbin2560 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_quality.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_redeye.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_scenemode.pngbin4808 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_storage.pngbin23597 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_back.pngbin1801 -> 266 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_camera.pngbin6819 -> 446 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_front.pngbin1801 -> 317 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_pan.pngbin2906 -> 302 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_video.pngbin5016 -> 234 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer.pngbin4636 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_button_stop.pngbin22755 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_button_video.pngbin9721 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_button_video_dim.pngbin9042 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_button_video_stop.pngbin8639 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_panorama.pngbin13009 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/shutter_panorama_dim.pngbin8950 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr.pngbin0 -> 314 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_off.pngbin0 -> 547 bytes
-rw-r--r--res/drawable-xxhdpi/ic_sce.pngbin0 -> 495 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_auto.pngbin7567 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_backlight.pngbin9812 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_beach.pngbin9725 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_candlelight.pngbin7044 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_flower.pngbin7974 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_hdr.pngbin9364 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_landscape.pngbin5314 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_night.pngbin6388 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_portrait.pngbin5548 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_snow.pngbin11515 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_sports.pngbin9649 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_scene_mode_sunset.pngbin5983 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings.pngbin0 -> 124 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings_filter.pngbin3208 -> 894 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_back.pngbin0 -> 377 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_camera.pngbin0 -> 666 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_front.pngbin0 -> 444 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_pan.pngbin0 -> 450 bytes
-rw-r--r--res/drawable-xxhdpi/ic_videocam_white_24dp.pngbin0 -> 178 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_hdr.pngbin0 -> 320 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_hdr_off.pngbin0 -> 489 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_sce.pngbin0 -> 634 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_settings.pngbin0 -> 97 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_settings_filter.pngbin0 -> 1146 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_switch_back.pngbin0 -> 489 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_switch_camera.pngbin0 -> 894 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_switch_front.pngbin0 -> 570 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_switch_pan.pngbin0 -> 564 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_switch_video.pngbin0 -> 290 bytes
-rw-r--r--res/drawable/btn_new_shutter.xml6
-rw-r--r--res/drawable/ic_flash_auto.xml12
-rw-r--r--res/drawable/ic_flash_off.xml14
-rw-r--r--res/drawable/ic_flash_on.xml13
-rw-r--r--res/drawable/ic_hdr.xml13
-rw-r--r--res/drawable/ic_hdr_off.xml14
-rw-r--r--res/drawable/ic_location.xml14
-rw-r--r--res/drawable/ic_location_off.xml16
-rw-r--r--res/drawable/ic_sce.xml14
-rw-r--r--res/drawable/ic_sce_action.xml16
-rw-r--r--res/drawable/ic_sce_night.xml15
-rw-r--r--res/drawable/ic_sce_off.xml14
-rw-r--r--res/drawable/ic_sce_party.xml20
-rw-r--r--res/drawable/ic_sce_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_antishake.xml15
-rw-r--r--res/drawable/ic_scene_mode_auto.xml14
-rw-r--r--res/drawable/ic_scene_mode_backlight.xml16
-rw-r--r--res/drawable/ic_scene_mode_beach.xml15
-rw-r--r--res/drawable/ic_scene_mode_candlelight.xml17
-rw-r--r--res/drawable/ic_scene_mode_flower.xml18
-rw-r--r--res/drawable/ic_scene_mode_hdr.xml13
-rw-r--r--res/drawable/ic_scene_mode_landscape.xml11
-rw-r--r--res/drawable/ic_scene_mode_night.xml15
-rw-r--r--res/drawable/ic_scene_mode_portrait.xml12
-rw-r--r--res/drawable/ic_scene_mode_smartauto.xml16
-rw-r--r--res/drawable/ic_scene_mode_snow.xml16
-rw-r--r--res/drawable/ic_scene_mode_sports.xml15
-rw-r--r--res/drawable/ic_scene_mode_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_text.xml13
-rw-r--r--res/drawable/ic_settings.xml11
-rw-r--r--res/drawable/ic_settings_bright_screen.xml13
-rw-r--r--res/drawable/ic_settings_continuous.xml13
-rw-r--r--res/drawable/ic_settings_countdowntimer.xml17
-rw-r--r--res/drawable/ic_settings_duration.xml16
-rw-r--r--res/drawable/ic_settings_exposure.xml13
-rw-r--r--res/drawable/ic_settings_facerec.xml18
-rw-r--r--res/drawable/ic_settings_filter.xml16
-rw-r--r--res/drawable/ic_settings_focus.xml20
-rw-r--r--res/drawable/ic_settings_focus_time.xml16
-rw-r--r--res/drawable/ic_settings_fps.xml20
-rw-r--r--res/drawable/ic_settings_iso.xml13
-rw-r--r--res/drawable/ic_settings_lightsource.xml16
-rw-r--r--res/drawable/ic_settings_location.xml14
-rw-r--r--res/drawable/ic_settings_picturesize.xml14
-rw-r--r--res/drawable/ic_settings_powershutter.xml14
-rw-r--r--res/drawable/ic_settings_quality.xml16
-rw-r--r--res/drawable/ic_settings_redeye.xml13
-rw-r--r--res/drawable/ic_settings_scenemode.xml14
-rw-r--r--res/drawable/ic_settings_storage.xml12
-rw-r--r--res/drawable/ic_switch_back.xml13
-rw-r--r--res/drawable/ic_switch_camera.xml16
-rw-r--r--res/drawable/ic_switch_front.xml13
-rw-r--r--res/drawable/ic_switch_pan.xml12
-rw-r--r--res/drawable/ic_switch_video.xml12
-rw-r--r--res/drawable/ic_timer.xml17
-rw-r--r--res/drawable/shutter_button_normal.xml11
-rw-r--r--res/drawable/shutter_button_pressed.xml11
-rw-r--r--res/drawable/shutter_button_stop.xml11
-rw-r--r--res/drawable/shutter_button_video.xml11
-rw-r--r--res/drawable/shutter_button_video_dim.xml11
-rw-r--r--res/drawable/shutter_button_video_stop.xml11
-rw-r--r--res/drawable/shutter_panorama.xml11
-rw-r--r--res/drawable/shutter_panorama_dim.xml11
-rw-r--r--res/layout-land-v19/switcher_popup.xml2
-rw-r--r--res/layout-land/keyguard_widget.xml2
-rw-r--r--res/layout-land/on_screen_hint.xml3
-rw-r--r--res/layout-land/switcher_popup.xml2
-rw-r--r--res/layout-port-v19/switcher_popup.xml2
-rw-r--r--res/layout-port/keyguard_widget.xml2
-rw-r--r--res/layout-port/on_screen_hint.xml5
-rw-r--r--res/layout-port/switcher_popup.xml2
-rwxr-xr-xres/layout/camera_controls.xml2
-rw-r--r--res/layout/camera_filmstrip.xml5
-rw-r--r--res/layout/countdown_setting_popup.xml4
-rw-r--r--res/layout/crop_activity.xml2
-rw-r--r--res/layout/list_menu_item.xml2
-rw-r--r--res/layout/placeholder_progressbar.xml3
-rw-r--r--res/layout/rotate_dialog.xml2
-rw-r--r--res/layout/tinyplanet_editor.xml6
-rw-r--r--res/values-land/styles.xml2
-rw-r--r--res/values-notouch-v14/styles.xml2
-rw-r--r--res/values-v14/styles.xml6
-rwxr-xr-xres/values/arrays.xml20
-rw-r--r--res/values/cm_colors.xml36
-rw-r--r--res/values/colors.xml94
-rwxr-xr-xres/values/dimens.xml3
-rw-r--r--res/values/styles.xml10
-rwxr-xr-xres/xml/camera_preferences.xml6
-rw-r--r--res/xml/video_preferences.xml5
-rw-r--r--src/com/android/camera/PhotoModule.java2
-rw-r--r--src/com/android/camera/PhotoUI.java20
-rw-r--r--src/com/android/camera/ShutterButton.java49
-rwxr-xr-xsrc/com/android/camera/ui/CameraControls.java2
-rw-r--r--src/com/android/camera/ui/ModuleSwitcher.java2
-rw-r--r--src/com/android/camera/ui/OneUICameraControls.java2
-rw-r--r--src/com/android/camera/ui/Switch.java2
289 files changed, 1023 insertions, 173 deletions
diff --git a/res/drawable-hdpi/ic_hdr.png b/res/drawable-hdpi/ic_hdr.png
index cda9890..bc34436 100644
--- a/res/drawable-hdpi/ic_hdr.png
+++ b/res/drawable-hdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_off.png b/res/drawable-hdpi/ic_hdr_off.png
index 28db73c..b8a658e 100644
--- a/res/drawable-hdpi/ic_hdr_off.png
+++ b/res/drawable-hdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_location.png b/res/drawable-hdpi/ic_location.png
deleted file mode 100644
index ff85d79..0000000
--- a/res/drawable-hdpi/ic_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_location_off.png b/res/drawable-hdpi/ic_location_off.png
deleted file mode 100644
index ae6e2ea..0000000
--- a/res/drawable-hdpi/ic_location_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce.png b/res/drawable-hdpi/ic_sce.png
index dd8bbd7..a1362ce 100644
--- a/res/drawable-hdpi/ic_sce.png
+++ b/res/drawable-hdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_action.png b/res/drawable-hdpi/ic_sce_action.png
deleted file mode 100644
index f968592..0000000
--- a/res/drawable-hdpi/ic_sce_action.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_night.png b/res/drawable-hdpi/ic_sce_night.png
deleted file mode 100644
index dc42ec9..0000000
--- a/res/drawable-hdpi/ic_sce_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_off.png b/res/drawable-hdpi/ic_sce_off.png
deleted file mode 100644
index 4c64578..0000000
--- a/res/drawable-hdpi/ic_sce_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_party.png b/res/drawable-hdpi/ic_sce_party.png
deleted file mode 100644
index 6c664ba..0000000
--- a/res/drawable-hdpi/ic_sce_party.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_sunset.png b/res/drawable-hdpi/ic_sce_sunset.png
deleted file mode 100644
index 82f74e6..0000000
--- a/res/drawable-hdpi/ic_sce_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_antishake.png b/res/drawable-hdpi/ic_scene_mode_antishake.png
deleted file mode 100644
index 9a399f5..0000000
--- a/res/drawable-hdpi/ic_scene_mode_antishake.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_auto.png b/res/drawable-hdpi/ic_scene_mode_auto.png
deleted file mode 100644
index 7ab84a7..0000000
--- a/res/drawable-hdpi/ic_scene_mode_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_backlight.png b/res/drawable-hdpi/ic_scene_mode_backlight.png
deleted file mode 100644
index 08b1e43..0000000
--- a/res/drawable-hdpi/ic_scene_mode_backlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_beach.png b/res/drawable-hdpi/ic_scene_mode_beach.png
deleted file mode 100644
index be3c41a..0000000
--- a/res/drawable-hdpi/ic_scene_mode_beach.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_candlelight.png b/res/drawable-hdpi/ic_scene_mode_candlelight.png
deleted file mode 100644
index 71abea0..0000000
--- a/res/drawable-hdpi/ic_scene_mode_candlelight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_flower.png b/res/drawable-hdpi/ic_scene_mode_flower.png
deleted file mode 100644
index 08b21dd..0000000
--- a/res/drawable-hdpi/ic_scene_mode_flower.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_hdr.png b/res/drawable-hdpi/ic_scene_mode_hdr.png
deleted file mode 100644
index d241075..0000000
--- a/res/drawable-hdpi/ic_scene_mode_hdr.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_landscape.png b/res/drawable-hdpi/ic_scene_mode_landscape.png
deleted file mode 100644
index 505a387..0000000
--- a/res/drawable-hdpi/ic_scene_mode_landscape.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_night.png b/res/drawable-hdpi/ic_scene_mode_night.png
deleted file mode 100644
index 7511775..0000000
--- a/res/drawable-hdpi/ic_scene_mode_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_portrait.png b/res/drawable-hdpi/ic_scene_mode_portrait.png
deleted file mode 100644
index 9e5e654..0000000
--- a/res/drawable-hdpi/ic_scene_mode_portrait.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_smartauto.png b/res/drawable-hdpi/ic_scene_mode_smartauto.png
deleted file mode 100644
index 1b088ce..0000000
--- a/res/drawable-hdpi/ic_scene_mode_smartauto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_snow.png b/res/drawable-hdpi/ic_scene_mode_snow.png
deleted file mode 100644
index a0634c7..0000000
--- a/res/drawable-hdpi/ic_scene_mode_snow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_sports.png b/res/drawable-hdpi/ic_scene_mode_sports.png
deleted file mode 100644
index bc72a64..0000000
--- a/res/drawable-hdpi/ic_scene_mode_sports.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_sunset.png b/res/drawable-hdpi/ic_scene_mode_sunset.png
deleted file mode 100644
index f122276..0000000
--- a/res/drawable-hdpi/ic_scene_mode_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_scene_mode_text.png b/res/drawable-hdpi/ic_scene_mode_text.png
deleted file mode 100644
index d595303..0000000
--- a/res/drawable-hdpi/ic_scene_mode_text.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings.png b/res/drawable-hdpi/ic_settings.png
index 6f543b6..8872aca 100644
--- a/res/drawable-hdpi/ic_settings.png
+++ b/res/drawable-hdpi/ic_settings.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_continuous.png b/res/drawable-hdpi/ic_settings_continuous.png
deleted file mode 100644
index df775b3..0000000
--- a/res/drawable-hdpi/ic_settings_continuous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_countdowntimer.png b/res/drawable-hdpi/ic_settings_countdowntimer.png
deleted file mode 100644
index acdb5b5..0000000
--- a/res/drawable-hdpi/ic_settings_countdowntimer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_duration.png b/res/drawable-hdpi/ic_settings_duration.png
deleted file mode 100644
index f19bbfb..0000000
--- a/res/drawable-hdpi/ic_settings_duration.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_exposure.png b/res/drawable-hdpi/ic_settings_exposure.png
deleted file mode 100644
index 5bbb08b..0000000
--- a/res/drawable-hdpi/ic_settings_exposure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_facerec.png b/res/drawable-hdpi/ic_settings_facerec.png
deleted file mode 100644
index 757c909..0000000
--- a/res/drawable-hdpi/ic_settings_facerec.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_filter.png b/res/drawable-hdpi/ic_settings_filter.png
index a50d758..5108a19 100644
--- a/res/drawable-hdpi/ic_settings_filter.png
+++ b/res/drawable-hdpi/ic_settings_filter.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_focus.png b/res/drawable-hdpi/ic_settings_focus.png
deleted file mode 100644
index f49c02f..0000000
--- a/res/drawable-hdpi/ic_settings_focus.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_fps.png b/res/drawable-hdpi/ic_settings_fps.png
deleted file mode 100644
index d209d63..0000000
--- a/res/drawable-hdpi/ic_settings_fps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_iso.png b/res/drawable-hdpi/ic_settings_iso.png
deleted file mode 100644
index 0f90eca..0000000
--- a/res/drawable-hdpi/ic_settings_iso.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_lightsource.png b/res/drawable-hdpi/ic_settings_lightsource.png
deleted file mode 100644
index 541fdab..0000000
--- a/res/drawable-hdpi/ic_settings_lightsource.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
deleted file mode 100644
index 2b5bffd..0000000
--- a/res/drawable-hdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_picturesize.png b/res/drawable-hdpi/ic_settings_picturesize.png
deleted file mode 100644
index 465abd9..0000000
--- a/res/drawable-hdpi/ic_settings_picturesize.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_quality.png b/res/drawable-hdpi/ic_settings_quality.png
deleted file mode 100644
index a68b3b3..0000000
--- a/res/drawable-hdpi/ic_settings_quality.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_redeye.png b/res/drawable-hdpi/ic_settings_redeye.png
deleted file mode 100644
index e97c7f3..0000000
--- a/res/drawable-hdpi/ic_settings_redeye.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_scenemode.png b/res/drawable-hdpi/ic_settings_scenemode.png
deleted file mode 100644
index 201956f..0000000
--- a/res/drawable-hdpi/ic_settings_scenemode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_storage.png b/res/drawable-hdpi/ic_settings_storage.png
deleted file mode 100644
index e008cc9..0000000
--- a/res/drawable-hdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_back.png b/res/drawable-hdpi/ic_switch_back.png
index 56ab209..4a5494f 100644
--- a/res/drawable-hdpi/ic_switch_back.png
+++ b/res/drawable-hdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera.png b/res/drawable-hdpi/ic_switch_camera.png
index 11dd39a..497c88c 100644
--- a/res/drawable-hdpi/ic_switch_camera.png
+++ b/res/drawable-hdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_front.png b/res/drawable-hdpi/ic_switch_front.png
index 56ab209..f36dcd4 100644
--- a/res/drawable-hdpi/ic_switch_front.png
+++ b/res/drawable-hdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_pan.png b/res/drawable-hdpi/ic_switch_pan.png
index 1b1544e..bfb5041 100644
--- a/res/drawable-hdpi/ic_switch_pan.png
+++ b/res/drawable-hdpi/ic_switch_pan.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_video.png b/res/drawable-hdpi/ic_switch_video.png
index 7432e8e..d83e0d5 100644
--- a/res/drawable-hdpi/ic_switch_video.png
+++ b/res/drawable-hdpi/ic_switch_video.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer.png b/res/drawable-hdpi/ic_timer.png
deleted file mode 100644
index a3cec8d..0000000
--- a/res/drawable-hdpi/ic_timer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_button_stop.png b/res/drawable-hdpi/shutter_button_stop.png
deleted file mode 100644
index ae6c1dc..0000000
--- a/res/drawable-hdpi/shutter_button_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_button_video.png b/res/drawable-hdpi/shutter_button_video.png
deleted file mode 100644
index 345c418..0000000
--- a/res/drawable-hdpi/shutter_button_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_button_video_dim.png b/res/drawable-hdpi/shutter_button_video_dim.png
deleted file mode 100644
index 88fad94..0000000
--- a/res/drawable-hdpi/shutter_button_video_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_button_video_stop.png b/res/drawable-hdpi/shutter_button_video_stop.png
deleted file mode 100644
index f5e1fb8..0000000
--- a/res/drawable-hdpi/shutter_button_video_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_panorama.png b/res/drawable-hdpi/shutter_panorama.png
deleted file mode 100644
index 16f0443..0000000
--- a/res/drawable-hdpi/shutter_panorama.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/shutter_panorama_dim.png b/res/drawable-hdpi/shutter_panorama_dim.png
deleted file mode 100644
index d7c7a06..0000000
--- a/res/drawable-hdpi/shutter_panorama_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr.png b/res/drawable-mdpi/ic_hdr.png
index 45dae46..b1eb541 100644
--- a/res/drawable-mdpi/ic_hdr.png
+++ b/res/drawable-mdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_off.png b/res/drawable-mdpi/ic_hdr_off.png
index c5003e6..c7a13d2 100644
--- a/res/drawable-mdpi/ic_hdr_off.png
+++ b/res/drawable-mdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_location.png b/res/drawable-mdpi/ic_location.png
deleted file mode 100644
index 57cecba..0000000
--- a/res/drawable-mdpi/ic_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_location_off.png b/res/drawable-mdpi/ic_location_off.png
deleted file mode 100644
index 548fd96..0000000
--- a/res/drawable-mdpi/ic_location_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce.png b/res/drawable-mdpi/ic_sce.png
index 724d278..1fbd670 100644
--- a/res/drawable-mdpi/ic_sce.png
+++ b/res/drawable-mdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_action.png b/res/drawable-mdpi/ic_sce_action.png
deleted file mode 100644
index 2cd9a8c..0000000
--- a/res/drawable-mdpi/ic_sce_action.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_night.png b/res/drawable-mdpi/ic_sce_night.png
deleted file mode 100644
index 9479262..0000000
--- a/res/drawable-mdpi/ic_sce_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_off.png b/res/drawable-mdpi/ic_sce_off.png
deleted file mode 100644
index 2a3f950..0000000
--- a/res/drawable-mdpi/ic_sce_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_party.png b/res/drawable-mdpi/ic_sce_party.png
deleted file mode 100644
index 5f0f9cf..0000000
--- a/res/drawable-mdpi/ic_sce_party.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_sunset.png b/res/drawable-mdpi/ic_sce_sunset.png
deleted file mode 100644
index 0cede83..0000000
--- a/res/drawable-mdpi/ic_sce_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_antishake.png b/res/drawable-mdpi/ic_scene_mode_antishake.png
deleted file mode 100644
index 8af786f..0000000
--- a/res/drawable-mdpi/ic_scene_mode_antishake.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_auto.png b/res/drawable-mdpi/ic_scene_mode_auto.png
deleted file mode 100644
index ea3740c..0000000
--- a/res/drawable-mdpi/ic_scene_mode_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_backlight.png b/res/drawable-mdpi/ic_scene_mode_backlight.png
deleted file mode 100644
index 34d7ecb..0000000
--- a/res/drawable-mdpi/ic_scene_mode_backlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_beach.png b/res/drawable-mdpi/ic_scene_mode_beach.png
deleted file mode 100644
index b8a3495..0000000
--- a/res/drawable-mdpi/ic_scene_mode_beach.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_candlelight.png b/res/drawable-mdpi/ic_scene_mode_candlelight.png
deleted file mode 100644
index 78cac30..0000000
--- a/res/drawable-mdpi/ic_scene_mode_candlelight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_flower.png b/res/drawable-mdpi/ic_scene_mode_flower.png
deleted file mode 100644
index 9934f1b..0000000
--- a/res/drawable-mdpi/ic_scene_mode_flower.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_hdr.png b/res/drawable-mdpi/ic_scene_mode_hdr.png
deleted file mode 100644
index caf4601..0000000
--- a/res/drawable-mdpi/ic_scene_mode_hdr.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_landscape.png b/res/drawable-mdpi/ic_scene_mode_landscape.png
deleted file mode 100644
index 0b2e986..0000000
--- a/res/drawable-mdpi/ic_scene_mode_landscape.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_night.png b/res/drawable-mdpi/ic_scene_mode_night.png
deleted file mode 100644
index 376c0f7..0000000
--- a/res/drawable-mdpi/ic_scene_mode_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_portrait.png b/res/drawable-mdpi/ic_scene_mode_portrait.png
deleted file mode 100644
index 845f56a..0000000
--- a/res/drawable-mdpi/ic_scene_mode_portrait.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_smartauto.png b/res/drawable-mdpi/ic_scene_mode_smartauto.png
deleted file mode 100644
index 1a253f1..0000000
--- a/res/drawable-mdpi/ic_scene_mode_smartauto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_snow.png b/res/drawable-mdpi/ic_scene_mode_snow.png
deleted file mode 100644
index 35d18de..0000000
--- a/res/drawable-mdpi/ic_scene_mode_snow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_sports.png b/res/drawable-mdpi/ic_scene_mode_sports.png
deleted file mode 100644
index 2053d90..0000000
--- a/res/drawable-mdpi/ic_scene_mode_sports.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_sunset.png b/res/drawable-mdpi/ic_scene_mode_sunset.png
deleted file mode 100644
index 7c496c7..0000000
--- a/res/drawable-mdpi/ic_scene_mode_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_scene_mode_text.png b/res/drawable-mdpi/ic_scene_mode_text.png
deleted file mode 100644
index 6e55b25..0000000
--- a/res/drawable-mdpi/ic_scene_mode_text.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings.png b/res/drawable-mdpi/ic_settings.png
index cd453ec..f43f4cd 100644
--- a/res/drawable-mdpi/ic_settings.png
+++ b/res/drawable-mdpi/ic_settings.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_continuous.png b/res/drawable-mdpi/ic_settings_continuous.png
deleted file mode 100644
index fbb1215..0000000
--- a/res/drawable-mdpi/ic_settings_continuous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_countdowntimer.png b/res/drawable-mdpi/ic_settings_countdowntimer.png
deleted file mode 100644
index 4538f3e..0000000
--- a/res/drawable-mdpi/ic_settings_countdowntimer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_duration.png b/res/drawable-mdpi/ic_settings_duration.png
deleted file mode 100644
index 665be26..0000000
--- a/res/drawable-mdpi/ic_settings_duration.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_exposure.png b/res/drawable-mdpi/ic_settings_exposure.png
deleted file mode 100644
index ba6b4d2..0000000
--- a/res/drawable-mdpi/ic_settings_exposure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_facerec.png b/res/drawable-mdpi/ic_settings_facerec.png
deleted file mode 100644
index 86af671..0000000
--- a/res/drawable-mdpi/ic_settings_facerec.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_focus.png b/res/drawable-mdpi/ic_settings_focus.png
deleted file mode 100644
index 0642dff..0000000
--- a/res/drawable-mdpi/ic_settings_focus.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_fps.png b/res/drawable-mdpi/ic_settings_fps.png
deleted file mode 100644
index 863ddf4..0000000
--- a/res/drawable-mdpi/ic_settings_fps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_iso.png b/res/drawable-mdpi/ic_settings_iso.png
deleted file mode 100644
index afb5123..0000000
--- a/res/drawable-mdpi/ic_settings_iso.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_lightsource.png b/res/drawable-mdpi/ic_settings_lightsource.png
deleted file mode 100644
index 9053b6a..0000000
--- a/res/drawable-mdpi/ic_settings_lightsource.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
deleted file mode 100644
index 40176eb..0000000
--- a/res/drawable-mdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_picturesize.png b/res/drawable-mdpi/ic_settings_picturesize.png
deleted file mode 100644
index bf4b4eb..0000000
--- a/res/drawable-mdpi/ic_settings_picturesize.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_quality.png b/res/drawable-mdpi/ic_settings_quality.png
deleted file mode 100644
index 6872f3b..0000000
--- a/res/drawable-mdpi/ic_settings_quality.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_redeye.png b/res/drawable-mdpi/ic_settings_redeye.png
deleted file mode 100644
index 0bb75cc..0000000
--- a/res/drawable-mdpi/ic_settings_redeye.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_scenemode.png b/res/drawable-mdpi/ic_settings_scenemode.png
deleted file mode 100644
index 057025a..0000000
--- a/res/drawable-mdpi/ic_settings_scenemode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_storage.png b/res/drawable-mdpi/ic_settings_storage.png
deleted file mode 100644
index a86ed67..0000000
--- a/res/drawable-mdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_back.png b/res/drawable-mdpi/ic_switch_back.png
index 6dce903..e1f0f1f 100644
--- a/res/drawable-mdpi/ic_switch_back.png
+++ b/res/drawable-mdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera.png b/res/drawable-mdpi/ic_switch_camera.png
index a978117..e830522 100644
--- a/res/drawable-mdpi/ic_switch_camera.png
+++ b/res/drawable-mdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_front.png b/res/drawable-mdpi/ic_switch_front.png
deleted file mode 100644
index c8ff3be..0000000
--- a/res/drawable-mdpi/ic_switch_front.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_pan.png b/res/drawable-mdpi/ic_switch_pan.png
index e454e3d..e22ea93 100644
--- a/res/drawable-mdpi/ic_switch_pan.png
+++ b/res/drawable-mdpi/ic_switch_pan.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_video.png b/res/drawable-mdpi/ic_switch_video.png
index 61c37ac..d146209 100644
--- a/res/drawable-mdpi/ic_switch_video.png
+++ b/res/drawable-mdpi/ic_switch_video.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer.png b/res/drawable-mdpi/ic_timer.png
deleted file mode 100644
index b55555f..0000000
--- a/res/drawable-mdpi/ic_timer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_button_stop.png b/res/drawable-mdpi/shutter_button_stop.png
deleted file mode 100644
index 7058814..0000000
--- a/res/drawable-mdpi/shutter_button_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_button_video.png b/res/drawable-mdpi/shutter_button_video.png
deleted file mode 100644
index 1fad540..0000000
--- a/res/drawable-mdpi/shutter_button_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_button_video_dim.png b/res/drawable-mdpi/shutter_button_video_dim.png
deleted file mode 100644
index 721abc3..0000000
--- a/res/drawable-mdpi/shutter_button_video_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_button_video_stop.png b/res/drawable-mdpi/shutter_button_video_stop.png
deleted file mode 100644
index 00985ae..0000000
--- a/res/drawable-mdpi/shutter_button_video_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_panorama.png b/res/drawable-mdpi/shutter_panorama.png
deleted file mode 100644
index b140e57..0000000
--- a/res/drawable-mdpi/shutter_panorama.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/shutter_panorama_dim.png b/res/drawable-mdpi/shutter_panorama_dim.png
deleted file mode 100644
index b6e22f9..0000000
--- a/res/drawable-mdpi/shutter_panorama_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr.png b/res/drawable-xhdpi/ic_hdr.png
index 12203a2..ec6f195 100644
--- a/res/drawable-xhdpi/ic_hdr.png
+++ b/res/drawable-xhdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_off.png b/res/drawable-xhdpi/ic_hdr_off.png
index 66fe29e..b5f1ee1 100644
--- a/res/drawable-xhdpi/ic_hdr_off.png
+++ b/res/drawable-xhdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_location.png b/res/drawable-xhdpi/ic_location.png
deleted file mode 100644
index ab553dc..0000000
--- a/res/drawable-xhdpi/ic_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_location_off.png b/res/drawable-xhdpi/ic_location_off.png
deleted file mode 100644
index 24594d1..0000000
--- a/res/drawable-xhdpi/ic_location_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce.png b/res/drawable-xhdpi/ic_sce.png
index 44d0d7a..c7a9491 100644
--- a/res/drawable-xhdpi/ic_sce.png
+++ b/res/drawable-xhdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_action.png b/res/drawable-xhdpi/ic_sce_action.png
deleted file mode 100644
index d79a7e0..0000000
--- a/res/drawable-xhdpi/ic_sce_action.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_night.png b/res/drawable-xhdpi/ic_sce_night.png
deleted file mode 100644
index 5dd62fc..0000000
--- a/res/drawable-xhdpi/ic_sce_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_off.png b/res/drawable-xhdpi/ic_sce_off.png
deleted file mode 100644
index 0279dcc..0000000
--- a/res/drawable-xhdpi/ic_sce_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_party.png b/res/drawable-xhdpi/ic_sce_party.png
deleted file mode 100644
index 638d2d3..0000000
--- a/res/drawable-xhdpi/ic_sce_party.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_sunset.png b/res/drawable-xhdpi/ic_sce_sunset.png
deleted file mode 100644
index 721966e..0000000
--- a/res/drawable-xhdpi/ic_sce_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_antishake.png b/res/drawable-xhdpi/ic_scene_mode_antishake.png
deleted file mode 100644
index 759c654..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_antishake.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_auto.png b/res/drawable-xhdpi/ic_scene_mode_auto.png
deleted file mode 100644
index da70ffa..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_backlight.png b/res/drawable-xhdpi/ic_scene_mode_backlight.png
deleted file mode 100644
index 0f60876..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_backlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_beach.png b/res/drawable-xhdpi/ic_scene_mode_beach.png
deleted file mode 100644
index 6751ccb..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_beach.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_candlelight.png b/res/drawable-xhdpi/ic_scene_mode_candlelight.png
deleted file mode 100644
index ae95a80..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_candlelight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_flower.png b/res/drawable-xhdpi/ic_scene_mode_flower.png
deleted file mode 100644
index 6a5d8a0..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_flower.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_hdr.png b/res/drawable-xhdpi/ic_scene_mode_hdr.png
deleted file mode 100644
index 660afcb..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_hdr.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_landscape.png b/res/drawable-xhdpi/ic_scene_mode_landscape.png
deleted file mode 100644
index aa97e02..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_landscape.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_night.png b/res/drawable-xhdpi/ic_scene_mode_night.png
deleted file mode 100644
index 9f3c0a3..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_portrait.png b/res/drawable-xhdpi/ic_scene_mode_portrait.png
deleted file mode 100644
index 0e7b747..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_portrait.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_smartauto.png b/res/drawable-xhdpi/ic_scene_mode_smartauto.png
deleted file mode 100644
index df9a7fe..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_smartauto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_snow.png b/res/drawable-xhdpi/ic_scene_mode_snow.png
deleted file mode 100644
index 707691f..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_snow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_sports.png b/res/drawable-xhdpi/ic_scene_mode_sports.png
deleted file mode 100644
index 53dab5e..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_sports.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_sunset.png b/res/drawable-xhdpi/ic_scene_mode_sunset.png
deleted file mode 100644
index 708faee..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_text.png b/res/drawable-xhdpi/ic_scene_mode_text.png
deleted file mode 100644
index 4750d8a..0000000
--- a/res/drawable-xhdpi/ic_scene_mode_text.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings.png b/res/drawable-xhdpi/ic_settings.png
index b6a76d5..1a80b18 100644
--- a/res/drawable-xhdpi/ic_settings.png
+++ b/res/drawable-xhdpi/ic_settings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_continuous.png b/res/drawable-xhdpi/ic_settings_continuous.png
deleted file mode 100644
index 9af7b87..0000000
--- a/res/drawable-xhdpi/ic_settings_continuous.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_countdowntimer.png b/res/drawable-xhdpi/ic_settings_countdowntimer.png
deleted file mode 100644
index 1764fdd..0000000
--- a/res/drawable-xhdpi/ic_settings_countdowntimer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_duration.png b/res/drawable-xhdpi/ic_settings_duration.png
deleted file mode 100644
index a5ffb44..0000000
--- a/res/drawable-xhdpi/ic_settings_duration.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_exposure.png b/res/drawable-xhdpi/ic_settings_exposure.png
deleted file mode 100644
index 06501ad..0000000
--- a/res/drawable-xhdpi/ic_settings_exposure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_facerec.png b/res/drawable-xhdpi/ic_settings_facerec.png
deleted file mode 100644
index 386c4a6..0000000
--- a/res/drawable-xhdpi/ic_settings_facerec.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_filter.png b/res/drawable-xhdpi/ic_settings_filter.png
index 1d8d4a5..d8164fb 100644
--- a/res/drawable-xhdpi/ic_settings_filter.png
+++ b/res/drawable-xhdpi/ic_settings_filter.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_focus.png b/res/drawable-xhdpi/ic_settings_focus.png
deleted file mode 100644
index cc4aaf9..0000000
--- a/res/drawable-xhdpi/ic_settings_focus.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_fps.png b/res/drawable-xhdpi/ic_settings_fps.png
deleted file mode 100644
index b5f40f8..0000000
--- a/res/drawable-xhdpi/ic_settings_fps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_iso.png b/res/drawable-xhdpi/ic_settings_iso.png
deleted file mode 100644
index f575b8e..0000000
--- a/res/drawable-xhdpi/ic_settings_iso.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_lightsource.png b/res/drawable-xhdpi/ic_settings_lightsource.png
deleted file mode 100644
index 6e03a85..0000000
--- a/res/drawable-xhdpi/ic_settings_lightsource.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
deleted file mode 100644
index ab553dc..0000000
--- a/res/drawable-xhdpi/ic_settings_location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_picturesize.png b/res/drawable-xhdpi/ic_settings_picturesize.png
deleted file mode 100644
index 54fd008..0000000
--- a/res/drawable-xhdpi/ic_settings_picturesize.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_quality.png b/res/drawable-xhdpi/ic_settings_quality.png
deleted file mode 100644
index 23c4176..0000000
--- a/res/drawable-xhdpi/ic_settings_quality.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_redeye.png b/res/drawable-xhdpi/ic_settings_redeye.png
deleted file mode 100644
index ec626d8..0000000
--- a/res/drawable-xhdpi/ic_settings_redeye.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_scenemode.png b/res/drawable-xhdpi/ic_settings_scenemode.png
deleted file mode 100644
index 44d0d7a..0000000
--- a/res/drawable-xhdpi/ic_settings_scenemode.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_storage.png b/res/drawable-xhdpi/ic_settings_storage.png
deleted file mode 100644
index 464b3fb..0000000
--- a/res/drawable-xhdpi/ic_settings_storage.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_back.png b/res/drawable-xhdpi/ic_switch_back.png
index f8984fb..b0768e3 100644
--- a/res/drawable-xhdpi/ic_switch_back.png
+++ b/res/drawable-xhdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera.png b/res/drawable-xhdpi/ic_switch_camera.png
index 7d24062..be9fb22 100644
--- a/res/drawable-xhdpi/ic_switch_camera.png
+++ b/res/drawable-xhdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_front.png b/res/drawable-xhdpi/ic_switch_front.png
index f8984fb..a80ccde 100644
--- a/res/drawable-xhdpi/ic_switch_front.png
+++ b/res/drawable-xhdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_pan.png b/res/drawable-xhdpi/ic_switch_pan.png
index a253666..75c4cb5 100644
--- a/res/drawable-xhdpi/ic_switch_pan.png
+++ b/res/drawable-xhdpi/ic_switch_pan.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_video.png b/res/drawable-xhdpi/ic_switch_video.png
index ed5f31d..44c28e2 100644
--- a/res/drawable-xhdpi/ic_switch_video.png
+++ b/res/drawable-xhdpi/ic_switch_video.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer.png b/res/drawable-xhdpi/ic_timer.png
deleted file mode 100644
index 1764fdd..0000000
--- a/res/drawable-xhdpi/ic_timer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_button_stop.png b/res/drawable-xhdpi/shutter_button_stop.png
deleted file mode 100644
index 88f60d3..0000000
--- a/res/drawable-xhdpi/shutter_button_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_button_video.png b/res/drawable-xhdpi/shutter_button_video.png
deleted file mode 100644
index da58053..0000000
--- a/res/drawable-xhdpi/shutter_button_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_button_video_dim.png b/res/drawable-xhdpi/shutter_button_video_dim.png
deleted file mode 100644
index fc41296..0000000
--- a/res/drawable-xhdpi/shutter_button_video_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_button_video_stop.png b/res/drawable-xhdpi/shutter_button_video_stop.png
deleted file mode 100644
index 44df24b..0000000
--- a/res/drawable-xhdpi/shutter_button_video_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_panorama.png b/res/drawable-xhdpi/shutter_panorama.png
deleted file mode 100644
index 8cfd7ee..0000000
--- a/res/drawable-xhdpi/shutter_panorama.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/shutter_panorama_dim.png b/res/drawable-xhdpi/shutter_panorama_dim.png
deleted file mode 100644
index 606032b..0000000
--- a/res/drawable-xhdpi/shutter_panorama_dim.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr.png b/res/drawable-xxhdpi/ic_hdr.png
new file mode 100644
index 0000000..5a3548d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_off.png b/res/drawable-xxhdpi/ic_hdr_off.png
new file mode 100644
index 0000000..f27219e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sce.png b/res/drawable-xxhdpi/ic_sce.png
new file mode 100644
index 0000000..b77735f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_auto.png b/res/drawable-xxhdpi/ic_scene_mode_auto.png
deleted file mode 100644
index 80370a3..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_backlight.png b/res/drawable-xxhdpi/ic_scene_mode_backlight.png
deleted file mode 100644
index 17b44ad..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_backlight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_beach.png b/res/drawable-xxhdpi/ic_scene_mode_beach.png
deleted file mode 100644
index e04c8f8..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_beach.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_candlelight.png b/res/drawable-xxhdpi/ic_scene_mode_candlelight.png
deleted file mode 100644
index 22db9db..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_candlelight.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_flower.png b/res/drawable-xxhdpi/ic_scene_mode_flower.png
deleted file mode 100644
index afa73e7..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_flower.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_hdr.png b/res/drawable-xxhdpi/ic_scene_mode_hdr.png
deleted file mode 100644
index 58e191b..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_hdr.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_landscape.png b/res/drawable-xxhdpi/ic_scene_mode_landscape.png
deleted file mode 100644
index 82805bc..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_landscape.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_night.png b/res/drawable-xxhdpi/ic_scene_mode_night.png
deleted file mode 100644
index 5f61c8a..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_night.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_portrait.png b/res/drawable-xxhdpi/ic_scene_mode_portrait.png
deleted file mode 100644
index 266ca23..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_portrait.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_snow.png b/res/drawable-xxhdpi/ic_scene_mode_snow.png
deleted file mode 100644
index c9b0b60..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_snow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_sports.png b/res/drawable-xxhdpi/ic_scene_mode_sports.png
deleted file mode 100644
index 2c167c8..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_sports.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_sunset.png b/res/drawable-xxhdpi/ic_scene_mode_sunset.png
deleted file mode 100644
index cd5a912..0000000
--- a/res/drawable-xxhdpi/ic_scene_mode_sunset.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings.png b/res/drawable-xxhdpi/ic_settings.png
new file mode 100644
index 0000000..eb4dda0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_filter.png b/res/drawable-xxhdpi/ic_settings_filter.png
index 4ecb055..fe1a45f 100644
--- a/res/drawable-xxhdpi/ic_settings_filter.png
+++ b/res/drawable-xxhdpi/ic_settings_filter.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_back.png b/res/drawable-xxhdpi/ic_switch_back.png
new file mode 100644
index 0000000..8392b2a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_camera.png b/res/drawable-xxhdpi/ic_switch_camera.png
new file mode 100644
index 0000000..c8e69dc
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_front.png b/res/drawable-xxhdpi/ic_switch_front.png
new file mode 100644
index 0000000..3eb24d1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_pan.png b/res/drawable-xxhdpi/ic_switch_pan.png
new file mode 100644
index 0000000..29a4250
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_pan.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_videocam_white_24dp.png b/res/drawable-xxhdpi/ic_videocam_white_24dp.png
new file mode 100644
index 0000000..1b2583d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_videocam_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_hdr.png b/res/drawable-xxxhdpi/ic_hdr.png
new file mode 100644
index 0000000..342b4d8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_hdr_off.png b/res/drawable-xxxhdpi/ic_hdr_off.png
new file mode 100644
index 0000000..717314e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sce.png b/res/drawable-xxxhdpi/ic_sce.png
new file mode 100644
index 0000000..598d56f
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings.png b/res/drawable-xxxhdpi/ic_settings.png
new file mode 100644
index 0000000..9c12e0c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_filter.png b/res/drawable-xxxhdpi/ic_settings_filter.png
new file mode 100644
index 0000000..4074e3a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_filter.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_switch_back.png b/res/drawable-xxxhdpi/ic_switch_back.png
new file mode 100644
index 0000000..8b2415b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_switch_camera.png b/res/drawable-xxxhdpi/ic_switch_camera.png
new file mode 100644
index 0000000..777658e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_switch_camera.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_switch_front.png b/res/drawable-xxxhdpi/ic_switch_front.png
new file mode 100644
index 0000000..951bc12
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_switch_pan.png b/res/drawable-xxxhdpi/ic_switch_pan.png
new file mode 100644
index 0000000..e859efa
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_switch_pan.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_switch_video.png b/res/drawable-xxxhdpi/ic_switch_video.png
new file mode 100644
index 0000000..ed20c07
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_switch_video.png
Binary files differ
diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml
index 5b9d6f7..a415812 100644
--- a/res/drawable/btn_new_shutter.xml
+++ b/res/drawable/btn_new_shutter.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" />
- <item android:drawable="@drawable/shutter_button_0" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/shutter_button_pressed" />
+ <item android:drawable="@drawable/shutter_button_normal" />
</selector>
-
diff --git a/res/drawable/ic_flash_auto.xml b/res/drawable/ic_flash_auto.xml
new file mode 100644
index 0000000..94d2d9c
--- /dev/null
+++ b/res/drawable/ic_flash_auto.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 2v12h3v9l7-12H9l4-9H3zm16 0h-2l-3.2 9h1.9l.7-2h3.2l.7 2h1.9L19 2zm-2.15
+5.65L18 4l1.15 3.65h-2.3z" />
+</vector>
diff --git a/res/drawable/ic_flash_off.xml b/res/drawable/ic_flash_off.xml
new file mode 100644
index 0000000..c3b61d3
--- /dev/null
+++ b/res/drawable/ic_flash_off.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3.27 3L2 4.27l5 5V13h3v9l3.58-6.14L17.73 20 19 18.73 3.27 3zM17
+10h-4l4-8H7v2.18l8.46 8.46L17 10z" />
+</vector>
diff --git a/res/drawable/ic_flash_on.xml b/res/drawable/ic_flash_on.xml
new file mode 100644
index 0000000..e0ed36f
--- /dev/null
+++ b/res/drawable/ic_flash_on.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7 2v11h3v9l7-12h-4l4-8z" />
+</vector>
diff --git a/res/drawable/ic_hdr.xml b/res/drawable/ic_hdr.xml
new file mode 100644
index 0000000..90c7f84
--- /dev/null
+++ b/res/drawable/ic_hdr.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 11.5v-1c0-.8-.7-1.5-1.5-1.5H16v6h1.5v-2h1.1l.9 2H21l-.9-2.1c.5-.3 .9 -.8 .9
+-1.4zm-1.5 0h-2v-1h2v1zm-13-.5h-2V9H3v6h1.5v-2.5h2V15H8V9H6.5v2zM13
+9H9.5v6H13c.8 0 1.5-.7 1.5-1.5v-3c0-.8-.7-1.5-1.5-1.5zm0 4.5h-2v-3h2v3z" />
+</vector>
diff --git a/res/drawable/ic_hdr_off.xml b/res/drawable/ic_hdr_off.xml
new file mode 100644
index 0000000..53a6c78
--- /dev/null
+++ b/res/drawable/ic_hdr_off.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.5 15v-2h1.1l.9 2H21l-.9-2.1c.5-.2 .9 -.8 .9
+-1.4v-1c0-.8-.7-1.5-1.5-1.5H16v4.9l1.1 1.1h.4zm0-4.5h2v1h-2v-1zm-4.5 0v.4l1.5
+1.5v-1.9c0-.8-.7-1.5-1.5-1.5h-1.9l1.5 1.5h.4zm-3.5-1l-7-7-1.1 1L6.9
+9h-.4v2h-2V9H3v6h1.5v-2.5h2V15H8v-4.9l1.5 1.5V15h3.4l7.6 7.6 1.1-1.1-12.1-12z" />
+</vector>
diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml
new file mode 100644
index 0000000..9151b8a
--- /dev/null
+++ b/res/drawable/ic_location.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_location_off.xml b/res/drawable/ic_location_off.xml
new file mode 100644
index 0000000..416c627
--- /dev/null
+++ b/res/drawable/ic_location_off.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0zm11.75 11.47l-.11-.11z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 6.5c1.38 0 2.5 1.12 2.5 2.5 0 .74-.33 1.39-.83 1.85l3.63 3.63c.98-1.86
+1.7-3.8 1.7-5.48 0-3.87-3.13-7-7-7-1.98 0-3.76 .83 -5.04 2.15l3.19 3.19c.46-.52
+1.11-.84 1.85-.84zm4.37 9.6l-4.63-4.63-.11-.11L3.27 3 2 4.27l3.18 3.18C5.07 7.95
+5 8.47 5 9c0 5.25 7 13 7 13s1.67-1.85 3.38-4.35L18.73 21 20 19.73l-3.63-3.63z" />
+</vector>
diff --git a/res/drawable/ic_sce.xml b/res/drawable/ic_sce.xml
new file mode 100644
index 0000000..e2481b3
--- /dev/null
+++ b/res/drawable/ic_sce.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_action.xml b/res/drawable/ic_sce_action.xml
new file mode 100644
index 0000000..e73dd7f
--- /dev/null
+++ b/res/drawable/ic_sce_action.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1
+2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9
+0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5 .1 -.8 .1 l-5.2
+2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z" />
+</vector>
diff --git a/res/drawable/ic_sce_night.xml b/res/drawable/ic_sce_night.xml
new file mode 100644
index 0000000..308de1d
--- /dev/null
+++ b/res/drawable/ic_sce_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_sce_off.xml b/res/drawable/ic_sce_off.xml
new file mode 100644
index 0000000..e2481b3
--- /dev/null
+++ b/res/drawable/ic_sce_off.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_party.xml b/res/drawable/ic_sce_party.xml
new file mode 100644
index 0000000..86cc510
--- /dev/null
+++ b/res/drawable/ic_sce_party.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 6c1.11 0 2-.9 2-2 0-.38-.1-.73-.29-1.03L12 0l-1.71 2.97c-.19 .3 -.29 .65
+-.29 1.03 0 1.1 .9 2 2 2zm4.6 9.99l-1.07-1.07-1.08 1.07c-1.3 1.3-3.58 1.31-4.89
+0l-1.07-1.07-1.09 1.07C6.75 16.64 5.88 17 4.96 17c-.73 0-1.4-.23-1.96-.61V21c0
+.55 .45 1 1 1h16c.55 0 1-.45 1-1v-4.61c-.56 .38 -1.23 .61 -1.96 .61 -.92
+0-1.79-.36-2.44-1.01zM18 9h-5V7h-2v2H6c-1.66 0-3 1.34-3 3v1.54c0 1.08 .88 1.96
+1.96 1.96 .52 0 1.02-.2 1.38-.57l2.14-2.13 2.13 2.13c.74 .74 2.03 .74 2.77
+0l2.14-2.13 2.13 2.13c.37 .37 .86 .57 1.38 .57 1.08 0 1.96-.88 1.96-1.96V12C21
+10.34 19.66 9 18 9z" />
+</vector>
diff --git a/res/drawable/ic_sce_sunset.xml b/res/drawable/ic_sce_sunset.xml
new file mode 100644
index 0000000..837b321
--- /dev/null
+++ b/res/drawable/ic_sce_sunset.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_antishake.xml b/res/drawable/ic_scene_mode_antishake.xml
new file mode 100644
index 0000000..5b5279a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_antishake.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 5.5V20c0 2.2-1.8 4-4 4h-7.3c-1.08 0-2.1-.43-2.85-1.19L1 14.83s1.26-1.23
+1.3-1.25c.22-.19 .49 -.29 .79 -.29 .22 0 .42 .06 .6 .16 .04 .01 4.31 2.46 4.31
+2.46V4c0-.83 .67 -1.5 1.5-1.5S11 3.17 11 4v7h1V1.5c0-.83 .67 -1.5 1.5-1.5S15 .67
+15 1.5V11h1V2.5c0-.83 .67 -1.5 1.5-1.5s1.5 .67 1.5 1.5V11h1V5.5c0-.83 .67 -1.5
+1.5-1.5s1.5 .67 1.5 1.5z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_auto.xml b/res/drawable/ic_scene_mode_auto.xml
new file mode 100644
index 0000000..e2481b3
--- /dev/null
+++ b/res/drawable/ic_scene_mode_auto.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_backlight.xml b/res/drawable/ic_scene_mode_backlight.xml
new file mode 100644
index 0000000..64b228e
--- /dev/null
+++ b/res/drawable/ic_scene_mode_backlight.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3.55 18.54l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8zM11 22.45h2V19.5h-2v2.95zM4
+10.5H1v2h3v-2zm11-4.19V1.5H9v4.81C7.21 7.35 6 9.28 6 11.5c0 3.31 2.69 6 6
+6s6-2.69 6-6c0-2.22-1.21-4.15-3-5.19zm5 4.19v2h3v-2h-3zm-2.76 7.66l1.79 1.8
+1.41-1.41-1.8-1.79-1.4 1.4z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_beach.xml b/res/drawable/ic_scene_mode_beach.xml
new file mode 100644
index 0000000..3716498
--- /dev/null
+++ b/res/drawable/ic_scene_mode_beach.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.127 14.56l1.43-1.43 6.44 6.443L19.57
+21zm4.293-5.73l2.86-2.86c-3.95-3.95-10.35-3.96-14.3-.02 3.93-1.3 8.31-.25 11.44
+2.88zM5.95 5.98c-3.94 3.95-3.93 10.35 .02 14.3l2.86-2.86C5.7 14.29 4.65 9.91
+5.95 5.98zm.02-.02l-.01 .01 c-.38 3.01 1.17 6.88 4.3
+10.02l5.73-5.73c-3.13-3.13-7.01-4.68-10.02-4.3z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_candlelight.xml b/res/drawable/ic_scene_mode_candlelight.xml
new file mode 100644
index 0000000..4be42eb
--- /dev/null
+++ b/res/drawable/ic_scene_mode_candlelight.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.5 .67 s.74 2.65 .74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07
+0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58
+8-8C20 8.61 17.41 3.8 13.5 .67 zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62
+1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58 .39 1.29 .59 2.65 .59 4.04 0
+2.65-2.15 4.8-4.8 4.8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_flower.xml b/res/drawable/ic_scene_mode_flower.xml
new file mode 100644
index 0000000..a738f4c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_flower.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22c4.97 0 9-4.03 9-9-4.97 0-9 4.03-9 9zM5.6 10.25c0 1.38 1.12 2.5 2.5 2.5
+.53 0 1.01-.16 1.42-.44l-.02 .19 c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12
+2.5-2.5l-.02-.19c.4 .28 .89 .44 1.42 .44 1.38 0 2.5-1.12 2.5-2.5
+0-1-.59-1.85-1.43-2.25 .84 -.4 1.43-1.25 1.43-2.25 0-1.38-1.12-2.5-2.5-2.5-.53
+0-1.01 .16 -1.42 .44 l.02-.19C14.5 2.12 13.38 1 12 1S9.5 2.12 9.5 3.5l.02 .19
+c-.4-.28-.89-.44-1.42-.44-1.38 0-2.5 1.12-2.5 2.5 0 1 .59 1.85 1.43 2.25-.84 .4
+-1.43 1.25-1.43 2.25zM12 5.5c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5S9.5 9.38
+9.5 8s1.12-2.5 2.5-2.5zM3 13c0 4.97 4.03 9 9 9 0-4.97-4.03-9-9-9z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_hdr.xml b/res/drawable/ic_scene_mode_hdr.xml
new file mode 100644
index 0000000..90c7f84
--- /dev/null
+++ b/res/drawable/ic_scene_mode_hdr.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 11.5v-1c0-.8-.7-1.5-1.5-1.5H16v6h1.5v-2h1.1l.9 2H21l-.9-2.1c.5-.3 .9 -.8 .9
+-1.4zm-1.5 0h-2v-1h2v1zm-13-.5h-2V9H3v6h1.5v-2.5h2V15H8V9H6.5v2zM13
+9H9.5v6H13c.8 0 1.5-.7 1.5-1.5v-3c0-.8-.7-1.5-1.5-1.5zm0 4.5h-2v-3h2v3z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_landscape.xml b/res/drawable/ic_scene_mode_landscape.xml
new file mode 100644
index 0000000..258f002
--- /dev/null
+++ b/res/drawable/ic_scene_mode_landscape.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14 6l-3.75 5 2.85 3.8-1.6 1.2C9.81 13.75 7 10 7 10l-6 8h22L14 6z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_night.xml b/res/drawable/ic_scene_mode_night.xml
new file mode 100644
index 0000000..308de1d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_portrait.xml b/res/drawable/ic_scene_mode_portrait.xml
new file mode 100644
index 0000000..587964d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_portrait.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8
+4v2h16v-2c0-2.66-5.33-4-8-4z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_smartauto.xml b/res/drawable/ic_scene_mode_smartauto.xml
new file mode 100644
index 0000000..26799fc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_smartauto.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 7V1h-6v2H7V1H1v6h2v10H1v6h6v-2h10v2h6v-6h-2V7h2zM3 3h2v2H3V3zm2
+18H3v-2h2v2zm12-2H7v-2H5V7h2V5h10v2h2v10h-2v2zm4 2h-2v-2h2v2zM19
+5V3h2v2h-2zm-5.27 9h-3.49l-.73 2H7.89l3.4-9h1.4l3.41
+9h-1.63l-.74-2zm-3.04-1.26h2.61L12 8.91l-1.31 3.83z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_snow.xml b/res/drawable/ic_scene_mode_snow.xml
new file mode 100644
index 0000000..564a4be
--- /dev/null
+++ b/res/drawable/ic_scene_mode_snow.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 11h-4.17l3.24-3.24-1.41-1.42L15 11h-2V9l4.66-4.66-1.42-1.41L13
+6.17V2h-2v4.17L7.76 2.93 6.34 4.34 11 9v2H9L4.34 6.34 2.93 7.76 6.17
+11H2v2h4.17l-3.24 3.24 1.41 1.42L9 13h2v2l-4.66 4.66 1.42 1.41L11
+17.83V22h2v-4.17l3.24 3.24 1.42-1.41L13 15v-2h2l4.66 4.66 1.41-1.42L17.83 13H22z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sports.xml b/res/drawable/ic_scene_mode_sports.xml
new file mode 100644
index 0000000..7af0f67
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sports.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 19.5 18 C 20.3284271247 18 21 18.6715728753 21 19.5 C 21 20.3284271247 20.3284271247 21 19.5 21 C 18.6715728753 21 18 20.3284271247 18 19.5 C 18 18.6715728753 18.6715728753 18 19.5 18 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 5.92L9 2v18H7v-1.73c-1.79 .35 -3 .99-3 1.73 0 1.1 2.69 2 6 2s6-.9
+6-2c0-.99-2.16-1.81-5-1.97V8.98l6-3.06z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sunset.xml b/res/drawable/ic_scene_mode_sunset.xml
new file mode 100644
index 0000000..837b321
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sunset.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_text.xml b/res/drawable/ic_scene_mode_text.xml
new file mode 100644
index 0000000..737e752
--- /dev/null
+++ b/res/drawable/ic_scene_mode_text.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z" />
+</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..5336248
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_bright_screen.xml b/res/drawable/ic_settings_bright_screen.xml
new file mode 100644
index 0000000..8250985
--- /dev/null
+++ b/res/drawable/ic_settings_bright_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31
+20H20v-4.69L23.31 12 20 8.69zM12 18c-.89 0-1.74-.2-2.5-.55C11.56 16.5 13 14.42
+13 12s-1.44-4.5-3.5-5.45C10.26 6.2 11.11 6 12 6c3.31 0 6 2.69 6 6s-2.69 6-6 6z" />
+</vector>
diff --git a/res/drawable/ic_settings_continuous.xml b/res/drawable/ic_settings_continuous.xml
new file mode 100644
index 0000000..9b1945e
--- /dev/null
+++ b/res/drawable/ic_settings_continuous.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15.96 10.29l-2.75 3.54-1.96-2.36L8.5 15h11l-3.54-4.71zM3 5H1v16c0 1.1 .9 2 2
+2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_settings_countdowntimer.xml b/res/drawable/ic_settings_countdowntimer.xml
new file mode 100644
index 0000000..887adeb
--- /dev/null
+++ b/res/drawable/ic_settings_countdowntimer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</vector>
diff --git a/res/drawable/ic_settings_duration.xml b/res/drawable/ic_settings_duration.xml
new file mode 100644
index 0000000..ad7cb0f
--- /dev/null
+++ b/res/drawable/ic_settings_duration.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7.88 3.39L6.6 1.86 2 5.71l1.29 1.53 4.59-3.85zM22 5.72l-4.6-3.86-1.29 1.53 4.6
+3.86L22 5.72zM12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9c4.97 0 9-4.03
+9-9s-4.03-9-9-9zm0 16c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7
+7zm1-11h-2v3H8v2h3v3h2v-3h3v-2h-3V9z" />
+</vector>
diff --git a/res/drawable/ic_settings_exposure.xml b/res/drawable/ic_settings_exposure.xml
new file mode 100644
index 0000000..9cd119f
--- /dev/null
+++ b/res/drawable/ic_settings_exposure.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 6c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zM5 8c-2.21 0-4 1.79-4
+4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2
+2z" />
+</vector>
diff --git a/res/drawable/ic_settings_facerec.xml b/res/drawable/ic_settings_facerec.xml
new file mode 100644
index 0000000..46d4364
--- /dev/null
+++ b/res/drawable/ic_settings_facerec.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 11.75c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25 1.25-.56
+1.25-1.25-.56-1.25-1.25-1.25zm6 0c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25
+1.25-.56 1.25-1.25-.56-1.25-1.25-1.25zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10
+10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8 0-.29 .02 -.58 .05 -.86
+2.36-1.05 4.23-2.98 5.21-5.37C11.07 8.33 14.05 10 17.42 10c.78 0 1.53-.09
+2.25-.26 .21 .71 .33 1.47 .33 2.26 0 4.41-3.59 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_filter.xml b/res/drawable/ic_settings_filter.xml
new file mode 100644
index 0000000..9f0e4ed
--- /dev/null
+++ b/res/drawable/ic_settings_filter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09
+2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15
+L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31
+.76 1.05 1.22 1.83 1.23 .26 0 .52-.05 .77 -.15l7.36-3.05c1.02-.42 1.51-1.59
+1.09-2.6zM7.88 8.75c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-2 11c0 1.1
+.9 2 2 2h1.45l-3.45-8.34v6.34z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus.xml b/res/drawable/ic_settings_focus.xml
new file mode 100644
index 0000000..5483d54
--- /dev/null
+++ b/res/drawable/ic_settings_focus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86 2.44-1.44
+3.9-1.62zm7.32 .19 C16.84 3.05 15.01 2.25 13 2.05v2.02c1.46 .18 2.79 .76 3.9
+1.62l1.42-1.43zM19.93 11h2.02c-.2-2.01-1-3.84-2.21-5.32L18.31 7.1c.86 1.11 1.44
+2.44 1.62 3.9zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46 .76
+-2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zM15 12c0-1.66-1.34-3-3-3s-3 1.34-3 3
+1.34 3 3 3 3-1.34 3-3zm3.31 4.9l1.43 1.43c1.21-1.48 2.01-3.32
+2.21-5.32h-2.02c-.18 1.45-.76 2.78-1.62 3.89zM13 19.93v2.02c2.01-.2 3.84-1
+5.32-2.21l-1.43-1.43c-1.1 .86 -2.43 1.44-3.89 1.62zm-7.32-.19C7.16 20.95 9 21.75
+11 21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus_time.xml b/res/drawable/ic_settings_focus_time.xml
new file mode 100644
index 0000000..c6a2e29
--- /dev/null
+++ b/res/drawable/ic_settings_focus_time.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16.21 4.16l4 4v-4zm4 12l-4 4h4zm-12
+4l-4-4v4zm-4-12l4-4h-4zm12.95-.95c-2.73-2.73-7.17-2.73-9.9 0s-2.73 7.17 0 9.9
+7.17 2.73 9.9 0 2.73-7.16 0-9.9zm-1.1 8.8c-2.13 2.13-5.57 2.13-7.7 0s-2.13-5.57
+0-7.7 5.57-2.13 7.7 0 2.13 5.57 0 7.7z" />
+ <path
+ android:pathData="M.21 .16 h24v24h-24z" />
+</vector>
diff --git a/res/drawable/ic_settings_fps.xml b/res/drawable/ic_settings_fps.xml
new file mode 100644
index 0000000..a94b5c3
--- /dev/null
+++ b/res/drawable/ic_settings_fps.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0V0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.05 9.79L10 7.5v9l3.05-2.29L16 12zm0 0L10 7.5v9l3.05-2.29L16 12zm0 0L10
+7.5v9l3.05-2.29L16 12zM11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86
+2.44-1.44 3.9-1.62zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46
+.76 -2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zm1.61 6.74C7.16 20.95 9 21.75 11
+21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43zM22 12c0 5.16-3.92 9.42-8.95
+9.95v-2.02C16.97 19.41 20 16.05 20 12s-3.03-7.41-6.95-7.93V2.05C18.08 2.58 22
+6.84 22 12z" />
+</vector>
diff --git a/res/drawable/ic_settings_iso.xml b/res/drawable/ic_settings_iso.xml
new file mode 100644
index 0000000..5292fa9
--- /dev/null
+++ b/res/drawable/ic_settings_iso.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2V5c0-1.1-.9-2-2-2zM5.5 7.5h2v-2H9v2h2V9H9v2H7.5V9h-2V7.5zM19 19H5L19
+5v14zm-2-2v-1.5h-5V17h5z" />
+</vector>
diff --git a/res/drawable/ic_settings_lightsource.xml b/res/drawable/ic_settings_lightsource.xml
new file mode 100644
index 0000000..421ef25
--- /dev/null
+++ b/res/drawable/ic_settings_lightsource.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1
+17.93c-3.94-.49-7-3.85-7-7.93s3.05-7.44 7-7.93v15.86zm2-15.86c1.03 .13 2 .45
+2.87 .93 H13v-.93zM13 7h5.24c.25 .31 .48 .65 .68 1H13V7zm0 3h6.74c.08 .33 .15
+.66 .19 1H13v-1zm0 9.93V19h2.87c-.87 .48 -1.84 .8 -2.87 .93 zM18.24
+17H13v-1h5.92c-.2 .35 -.43 .69 -.68 1zm1.5-3H13v-1h6.93c-.04 .34 -.11 .67 -.19
+1z" />
+</vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
new file mode 100644
index 0000000..9151b8a
--- /dev/null
+++ b/res/drawable/ic_settings_location.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_picturesize.xml b/res/drawable/ic_settings_picturesize.xml
new file mode 100644
index 0000000..e74229f
--- /dev/null
+++ b/res/drawable/ic_settings_picturesize.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16 10h-2v2h2v-2zm0 4h-2v2h2v-2zm-8-4H6v2h2v-2zm4 0h-2v2h2v-2zm8-6H4c-1.1 0-2
+.9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V6h16v12z" />
+</vector>
diff --git a/res/drawable/ic_settings_powershutter.xml b/res/drawable/ic_settings_powershutter.xml
new file mode 100644
index 0000000..1f723df
--- /dev/null
+++ b/res/drawable/ic_settings_powershutter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 4V1h2v3h3v2H5v3H3V6H0V4h3zm3 6V7h3V4h7l1.83 2H21c1.1 0 2 .9 2 2v12c0 1.1-.9
+2-2 2H5c-1.1 0-2-.9-2-2V10h3zm7 9c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24
+5 5 5zm-3.2-5c0 1.77 1.43 3.2 3.2 3.2s3.2-1.43 3.2-3.2-1.43-3.2-3.2-3.2-3.2
+1.43-3.2 3.2z" />
+</vector>
diff --git a/res/drawable/ic_settings_quality.xml b/res/drawable/ic_settings_quality.xml
new file mode 100644
index 0000000..6d76669
--- /dev/null
+++ b/res/drawable/ic_settings_quality.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M24 24H0V0h24v24z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 15h2v2h-2v-2zm0-4h2v2h-2v-2zm2 8h-2v2c1 0 2-1 2-2zM13 3h2v2h-2V3zm8
+4h2v2h-2V7zm0-4v2h2c0-1-1-2-2-2zM1 7h2v2H1V7zm16-4h2v2h-2V3zm0 16h2v2h-2v-2zM3
+3C2 3 1 4 1 5h2V3zm6 0h2v2H9V3zM5 3h2v2H5V3zm-4 8v8c0 1.1 .9 2 2 2h12V11H1zm2
+8l2.5-3.21 1.79 2.15 2.5-3.22L13 19H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_redeye.xml b/res/drawable/ic_settings_redeye.xml
new file mode 100644
index 0000000..5f59140
--- /dev/null
+++ b/res/drawable/ic_settings_redeye.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11
+11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
+5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+</vector>
diff --git a/res/drawable/ic_settings_scenemode.xml b/res/drawable/ic_settings_scenemode.xml
new file mode 100644
index 0000000..e2481b3
--- /dev/null
+++ b/res/drawable/ic_settings_scenemode.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
new file mode 100644
index 0000000..a880b42
--- /dev/null
+++ b/res/drawable/ic_settings_storage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18 2h-8L4.02 8 4 20c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-6
+6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z" />
+</vector>
diff --git a/res/drawable/ic_switch_back.xml b/res/drawable/ic_switch_back.xml
new file mode 100644
index 0000000..85504d6
--- /dev/null
+++ b/res/drawable/ic_switch_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zm3-20H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2
+2h10c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm-5 6c-1.11 0-2-.9-2-2s.89-2 1.99-2 2 .9 2
+2C14 5.1 13.1 6 12 6z" />
+</vector>
diff --git a/res/drawable/ic_switch_camera.xml b/res/drawable/ic_switch_camera.xml
new file mode 100644
index 0000000..7dfd1f2
--- /dev/null
+++ b/res/drawable/ic_switch_camera.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
+5-2.24 5-5 5z" />
+</vector>
diff --git a/res/drawable/ic_switch_front.xml b/res/drawable/ic_switch_front.xml
new file mode 100644
index 0000000..c2bc251
--- /dev/null
+++ b/res/drawable/ic_switch_front.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zM12 8c1.1 0 2-.9 2-2s-.9-2-2-2-1.99 .9
+-1.99 2S10.9 8 12 8zm5-8H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2 2h10c1.1 0 2-.9
+2-2V2c0-1.1-.9-2-2-2zM7 2h10v10.5c0-1.67-3.33-2.5-5-2.5s-5 .83-5 2.5V2z" />
+</vector>
diff --git a/res/drawable/ic_switch_pan.xml b/res/drawable/ic_switch_pan.xml
new file mode 100644
index 0000000..cbce6ba
--- /dev/null
+++ b/res/drawable/ic_switch_pan.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 18V6c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h18c1.1 0 2-.9
+2-2zM8.5 12.5l2.5 3.01L14.5 11l4.5 6H5l3.5-4.5z" />
+</vector>
diff --git a/res/drawable/ic_switch_video.xml b/res/drawable/ic_switch_video.xml
new file mode 100644
index 0000000..e4dbbe9
--- /dev/null
+++ b/res/drawable/ic_switch_video.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55 .45 1 1 1h12c.55 0 1-.45
+1-1v-3.5l4 4v-11l-4 4z" />
+</vector>
diff --git a/res/drawable/ic_timer.xml b/res/drawable/ic_timer.xml
new file mode 100644
index 0000000..887adeb
--- /dev/null
+++ b/res/drawable/ic_timer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</vector>
diff --git a/res/drawable/shutter_button_normal.xml b/res/drawable/shutter_button_normal.xml
new file mode 100644
index 0000000..fffed90
--- /dev/null
+++ b/res/drawable/shutter_button_normal.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/pic"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_button_pressed.xml b/res/drawable/shutter_button_pressed.xml
new file mode 100644
index 0000000..cbedb87
--- /dev/null
+++ b/res/drawable/shutter_button_pressed.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/pic_pressed"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_button_stop.xml b/res/drawable/shutter_button_stop.xml
new file mode 100644
index 0000000..6cf9283
--- /dev/null
+++ b/res/drawable/shutter_button_stop.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/pano_stop"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_button_video.xml b/res/drawable/shutter_button_video.xml
new file mode 100644
index 0000000..f937cce
--- /dev/null
+++ b/res/drawable/shutter_button_video.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/video"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_button_video_dim.xml b/res/drawable/shutter_button_video_dim.xml
new file mode 100644
index 0000000..e184767
--- /dev/null
+++ b/res/drawable/shutter_button_video_dim.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/video_pressed"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_button_video_stop.xml b/res/drawable/shutter_button_video_stop.xml
new file mode 100644
index 0000000..3883c99
--- /dev/null
+++ b/res/drawable/shutter_button_video_stop.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/video_stop"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_panorama.xml b/res/drawable/shutter_panorama.xml
new file mode 100644
index 0000000..bc70fea
--- /dev/null
+++ b/res/drawable/shutter_panorama.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/pano"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/drawable/shutter_panorama_dim.xml b/res/drawable/shutter_panorama_dim.xml
new file mode 100644
index 0000000..e7711c7
--- /dev/null
+++ b/res/drawable/shutter_panorama_dim.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/pano_pressed"
+ android:pathData="M 12 2 C 17.5228474983 2 22 6.47715250169 22 12 C 22 17.5228474983 17.5228474983 22 12 22 C 6.47715250169 22 2 17.5228474983 2 12 C 2 6.47715250169 6.47715250169 2 12 2 Z" />
+</vector>
diff --git a/res/layout-land-v19/switcher_popup.xml b/res/layout-land-v19/switcher_popup.xml
index 07ed8cc..d09d9d4 100644
--- a/res/layout-land-v19/switcher_popup.xml
+++ b/res/layout-land-v19/switcher_popup.xml
@@ -21,4 +21,4 @@
android:layout_gravity="bottom|right"
android:layout_marginRight="8dip"
android:layout_marginBottom="8dip"
- android:background="#80000000" />
+ android:background="@color/black" />
diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml
index f0f4362..3156900 100644
--- a/res/layout-land/keyguard_widget.xml
+++ b/res/layout-land/keyguard_widget.xml
@@ -58,6 +58,6 @@
android:layout_marginRight="2dip"
android:contentDescription="@string/accessibility_mode_picker"
android:scaleType="center"
- android:src="@drawable/ic_switcher_menu_indicator" />
+ android:src="@android:color/transparent" />
</RelativeLayout>
diff --git a/res/layout-land/on_screen_hint.xml b/res/layout-land/on_screen_hint.xml
index 59b0d1a..b935071 100644
--- a/res/layout-land/on_screen_hint.xml
+++ b/res/layout-land/on_screen_hint.xml
@@ -23,7 +23,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="@style/OnScreenHintTextAppearance.Small"
- android:textColor="#ffffffff"
- android:shadowColor="#BB000000"
+ android:textColor="@color/white"
android:shadowRadius="2.75" />
</LinearLayout>
diff --git a/res/layout-land/switcher_popup.xml b/res/layout-land/switcher_popup.xml
index fc2d7bc..1c552c9 100644
--- a/res/layout-land/switcher_popup.xml
+++ b/res/layout-land/switcher_popup.xml
@@ -25,4 +25,4 @@
android:paddingRight="8dip"
android:paddingTop="16dip"
android:paddingBottom="16dip"
- android:background="#80000000" />
+ android:background="@color/black" />
diff --git a/res/layout-port-v19/switcher_popup.xml b/res/layout-port-v19/switcher_popup.xml
index fe0dd60..f114455 100644
--- a/res/layout-port-v19/switcher_popup.xml
+++ b/res/layout-port-v19/switcher_popup.xml
@@ -21,4 +21,4 @@
android:layout_gravity="bottom|left"
android:layout_marginLeft="8dip"
android:layout_marginBottom="8dip"
- android:background="#80000000" />
+ android:background="@color/black" />
diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml
index 5e073f4..04816a3 100644
--- a/res/layout-port/keyguard_widget.xml
+++ b/res/layout-port/keyguard_widget.xml
@@ -55,6 +55,6 @@
android:layout_marginBottom="3dip"
android:scaleType="center"
android:contentDescription="@string/accessibility_mode_picker"
- android:src="@drawable/ic_switcher_menu_indicator" />
+ android:src="@android:color/transparent" />
</RelativeLayout>
diff --git a/res/layout-port/on_screen_hint.xml b/res/layout-port/on_screen_hint.xml
index 467b67f..e42bf1c 100644
--- a/res/layout-port/on_screen_hint.xml
+++ b/res/layout-port/on_screen_hint.xml
@@ -23,9 +23,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textAppearance="@style/OnScreenHintTextAppearance.Small"
- android:textColor="#ffffffff"
- android:shadowColor="#BB000000"
+ android:textColor="@color/white"
android:shadowRadius="2.75" />
</LinearLayout>
-
-
diff --git a/res/layout-port/switcher_popup.xml b/res/layout-port/switcher_popup.xml
index 8fe09a3..90a64ae 100644
--- a/res/layout-port/switcher_popup.xml
+++ b/res/layout-port/switcher_popup.xml
@@ -25,4 +25,4 @@
android:paddingRight="16dip"
android:paddingTop="8dip"
android:paddingBottom="8dip"
- android:background="#80000000" />
+ android:background="@color/black" />
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 5e33709..fee20f1 100755
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -59,6 +59,7 @@
android:layout_height="@dimen/shutter_size"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="@dimen/shutter_offset"
+ android:layout_marginTop="@dimen/shutter_offset_top"
android:clickable="true"
android:contentDescription="@string/accessibility_shutter_button"
android:focusable="true"
@@ -72,6 +73,7 @@
android:layout_height="@dimen/shutter_size"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="@dimen/shutter_offset"
+ android:layout_marginTop="@dimen/shutter_offset_top"
android:clickable="true"
android:contentDescription="@string/accessibility_shutter_button"
android:focusable="true"
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 00bbcdb..2075a94 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -48,9 +48,8 @@
<TextView
android:id="@+id/pano_stitching_progress_text"
android:text="@string/rendering_photo_sphere"
- android:textColor="#ffffffff"
+ android:textColor="@color/white"
android:textSize="14sp"
- android:shadowColor="#ff000000"
android:shadowDx="0"
android:shadowDy="0"
android:shadowRadius="2"
@@ -61,7 +60,7 @@
<ProgressBar
android:id="@+id/pano_stitching_progress_bar"
- style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
+ style="@android:style/Widget.Material.Light.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml
index 22acd92..9baa882 100644
--- a/res/layout/countdown_setting_popup.xml
+++ b/res/layout/countdown_setting_popup.xml
@@ -66,7 +66,7 @@
android:orientation="vertical" >
<View
- android:background="#40ffffff"
+ android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="1dip" />
<LinearLayout
@@ -84,7 +84,7 @@
</LinearLayout>
<View
- android:background="#40ffffff"
+ android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="1dip" />
diff --git a/res/layout/crop_activity.xml b/res/layout/crop_activity.xml
index a2841e6..3871d32 100644
--- a/res/layout/crop_activity.xml
+++ b/res/layout/crop_activity.xml
@@ -39,7 +39,7 @@
<ProgressBar
android:id="@+id/loading"
- style="@android:style/Widget.Holo.ProgressBar.Large"
+ style="@android:style/Widget.Material.ProgressBar.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml
index fdf63f7..53ef476 100644
--- a/res/layout/list_menu_item.xml
+++ b/res/layout/list_menu_item.xml
@@ -61,7 +61,7 @@
android:shadowDy="1"
android:shadowRadius="2"
android:text="@string/crop_save"
- android:textColor="#33b5e5"
+ android:textColor="@color/white"
android:textSize="10dip"
android:textStyle="bold" />
diff --git a/res/layout/placeholder_progressbar.xml b/res/layout/placeholder_progressbar.xml
index 45eadfb..762186e 100644
--- a/res/layout/placeholder_progressbar.xml
+++ b/res/layout/placeholder_progressbar.xml
@@ -17,7 +17,7 @@
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/placeholder_progress"
- style="@android:style/Widget.Holo.ProgressBar.Large"
+ style="@android:style/Widget.Material.ProgressBar.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
@@ -26,4 +26,3 @@
android:indeterminate="true"
android:indeterminateOnly="true"
android:background="@null"/>
-
diff --git a/res/layout/rotate_dialog.xml b/res/layout/rotate_dialog.xml
index c62ce91..48a6e69 100644
--- a/res/layout/rotate_dialog.xml
+++ b/res/layout/rotate_dialog.xml
@@ -18,7 +18,7 @@
android:clickable="true"
android:gravity="center"
android:visibility="gone"
- android:background="#55000000"
+ android:background="@color/black"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout/tinyplanet_editor.xml b/res/layout/tinyplanet_editor.xml
index 8880c2c..f5bd5d2 100644
--- a/res/layout/tinyplanet_editor.xml
+++ b/res/layout/tinyplanet_editor.xml
@@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tiny_planet_zoom"
- android:textColor="#FFF" />
+ android:textColor="@color/white" />
<SeekBar
android:id="@+id/zoomSlider"
@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/tiny_planet_rotate"
- android:textColor="#FFF" />
+ android:textColor="@color/white" />
<SeekBar
android:id="@+id/angleSlider"
@@ -70,4 +70,4 @@
android:text="@string/create_tiny_planet" />
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 69b524e..7195ac8 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -16,7 +16,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Spinner primary text is smaller than usual due to extra vertical padding in spinner asset -->
- <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+ <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
<item name="android:textSize">14sp</item>
</style>
diff --git a/res/values-notouch-v14/styles.xml b/res/values-notouch-v14/styles.xml
index 1b1b1af..c542948 100644
--- a/res/values-notouch-v14/styles.xml
+++ b/res/values-notouch-v14/styles.xml
@@ -15,7 +15,7 @@
-->
<resources>
- <style name="Theme.GalleryBase" parent="android:Theme.Holo.NoActionBar.Fullscreen">
+ <style name="Theme.GalleryBase" parent="android:Theme.Material.NoActionBar.Fullscreen">
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index c05bf30..a511184 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -15,15 +15,15 @@
-->
<resources>
- <style name="Theme.GalleryBase" parent="android:Theme.Holo">
+ <style name="Theme.GalleryBase" parent="android:Theme.Material">
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>
<style name="ActionBarTwoLineItem">
<item name="android:background">?android:attr/activatedBackgroundIndicator</item>
</style>
- <style name="Theme.Photos.Gallery" parent="android:Theme.Holo.Light">
+ <style name="Theme.Photos.Gallery" parent="android:Theme.Material.Light">
</style>
- <style name="Theme.Photos.Fullscreen" parent="android:Theme.Holo">
+ <style name="Theme.Photos.Fullscreen" parent="android:Theme.Material">
</style>
</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3dbb801..4ec96cf 100755
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -228,16 +228,16 @@
</string-array>
<array name="camera_flashmode_icons" translatable="false">
- <item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_auto_holo_light</item>
- <item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_off</item>
+ <item>@drawable/ic_flash_auto</item>
+ <item>@drawable/ic_flash_on</item>
<item>@drawable/ic_flash_redeye_holo_light</item>
</array>
<array name="camera_flashmode_largeicons" translatable="false">
- <item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_auto_holo_light</item>
- <item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_off</item>
+ <item>@drawable/ic_flash_auto</item>
+ <item>@drawable/ic_flash_on</item>
<item>@drawable/ic_flash_redeye_holo_light</item>
</array>
@@ -258,13 +258,13 @@
</string-array>
<array name="video_flashmode_icons" translatable="false">
- <item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_off</item>
+ <item>@drawable/ic_flash_on</item>
</array>
<array name="video_flashmode_largeicons" translatable="false">
- <item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_on_holo_light</item>
+ <item>@drawable/ic_flash_off</item>
+ <item>@drawable/ic_flash_on</item>
</array>
<string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
new file mode 100644
index 0000000..371a3db
--- /dev/null
+++ b/res/values/cm_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <color name="white">#fafafa</color>
+ <color name="black">#212121</color>
+ <color name="grey">#e0e0e0</color>
+ <color name="transparent">@android:color/transparent</color>
+
+ <color name="red">#F44336</color>
+ <color name="green">#4CAF50</color>
+ <color name="blue">#3F51B5</color>
+
+ <color name="pic">@color/white</color>
+ <color name="pic_pressed">@color/grey</color>
+
+ <color name="video">@color/red</color>
+ <color name="video_pressed">#D32F2F</color>
+ <color name="video_stop">#E57373</color>
+
+ <color name="pano">@color/green</color>
+ <color name="pano_pressed">#388E3C</color>
+ <color name="pano_stop">#81C784</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 80759af..aea3485 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -14,68 +14,68 @@
limitations under the License.
-->
<resources>
- <color name="default_background">#000</color>
+ <color name="default_background">@color/black</color>
<!-- configuration for album set page -->
- <color name="albumset_background">#1A1A1A</color>
- <color name="albumset_placeholder">#333</color>
- <color name="albumset_label_background">#EE414143</color>
- <color name="albumset_label_title">#FBFBFB</color>
- <color name="albumset_label_count">#A9ABAD</color>
+ <color name="albumset_background">@color/black</color>
+ <color name="albumset_placeholder">@color/black</color>
+ <color name="albumset_label_background">@color/black</color>
+ <color name="albumset_label_title">@color/white</color>
+ <color name="albumset_label_count">@color/grey</color>
<!-- configuration for album page -->
- <color name="album_background">#1A1A1A</color>
- <color name="album_placeholder">#333</color>
+ <color name="album_background">@color/black</color>
+ <color name="album_placeholder">@color/black</color>
<!-- configuration for photo page -->
- <color name="photo_background">#1A1A1A</color>
- <color name="photo_placeholder">#333</color>
+ <color name="photo_background">@color/black</color>
+ <color name="photo_placeholder">@color/black</color>
<!-- configuration for manage cache page -->
- <color name="cache_background">#1A1A1A</color>
- <color name="cache_placeholder">#333</color>
+ <color name="cache_background">@color/black</color>
+ <color name="cache_placeholder">@color/black</color>
- <color name="bitmap_screennail_placeholder">#333</color>
+ <color name="bitmap_screennail_placeholder">@color/black</color>
- <color name="slideshow_background">#1A1A1A</color>
+ <color name="slideshow_background">@color/black</color>
- <color name="button_dark_transparent_background">#6000</color>
+ <color name="button_dark_transparent_background">@color/black</color>
- <color name="ingest_highlight_semitransparent">#8833b5e5</color>
- <color name="ingest_date_tile_text">#33b5e5</color>
+ <color name="ingest_highlight_semitransparent">@color/blue</color>
+ <color name="ingest_date_tile_text">@color/blue</color>
<!-- Camera resources below -->
- <color name="recording_time_elapsed_text">#FFFFFFFF</color>
- <color name="recording_time_remaining_text">#FFFF0033</color>
- <color name="on_viewfinder_label_background_color">#77333333</color>
- <color name="review_control_pressed_color">#FF33B5E5</color>
- <color name="review_control_pressed_fan_color">#3F33B5E5</color>
- <color name="review_background">#FF000000</color>
- <color name="icon_disabled_color">#DD777777</color>
- <color name="time_lapse_arc">#FFC5C5C5</color>
- <color name="indicator_background">#40000000</color>
- <color name="popup_title_color">#ff33b5e5</color>
- <color name="popup_background">#ff282828</color>
- <color name="pano_progress_empty">#FF2E2E2E</color>
- <color name="pano_progress_done">#FF33525E</color>
- <color name="pano_progress_indication">#FF0099CC</color>
- <color name="pano_progress_indication_fast">#FFFF2222</color>
- <color name="mode_selection_border">#33B5E5</color>
- <color name="holo_blue_light">#ff33b5e5</color>
- <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
- <color name="bright_foreground_holo_dark">#fff3f3f3</color>
- <color name="face_detect_start">#80ffffff</color>
- <color name="face_detect_success">#8050d060</color>
- <color name="face_detect_fail">#80d05060</color>
- <color name="gray">#FFAAAAAA</color>
-
- <color name="setting_color">#ff10aadc</color>
- <color name="setting_color_light">#ffade9fd</color>
- <color name="list_divider_color">#d8ababab</color>
-
- <color name="camera_control_bg_opaque">#ff191919</color>
- <color name="camera_control_bg_transparent">#4d191919</color>
+ <color name="recording_time_elapsed_text">@color/white</color>
+ <color name="recording_time_remaining_text">@color/red</color>
+ <color name="on_viewfinder_label_background_color">@color/black</color>
+ <color name="review_control_pressed_color">@color/blue</color>
+ <color name="review_control_pressed_fan_color">@color/blue</color>
+ <color name="review_background">@color/black</color>
+ <color name="icon_disabled_color">@color/grey</color>
+ <color name="time_lapse_arc">@color/grey</color>
+ <color name="indicator_background">@color/black</color>
+ <color name="popup_title_color">@color/blue</color>
+ <color name="popup_background">@color/black</color>
+ <color name="pano_progress_empty">@color/black</color>
+ <color name="pano_progress_done">#33525E</color>
+ <color name="pano_progress_indication">@color/blue</color>
+ <color name="pano_progress_indication_fast">@color/red</color>
+ <color name="mode_selection_border">@color/blue</color>
+ <color name="holo_blue_light">@color/blue</color>
+ <color name="bright_foreground_disabled_holo_dark">@color/black</color>
+ <color name="bright_foreground_holo_dark">@color/white</color>
+ <color name="face_detect_start">@color/white</color>
+ <color name="face_detect_success">@color/green</color>
+ <color name="face_detect_fail">@color/red</color>
+ <color name="gray">@color/grey</color>
+
+ <color name="setting_color">@color/black</color>
+ <color name="setting_color_light">@color/white</color>
+ <color name="list_divider_color">@color/black</color>
+
+ <color name="camera_control_bg_opaque">@color/black</color>
+ <color name="camera_control_bg_transparent">#40212121</color>
<color name="refocus_indicator_1">#a0ffffff</color>
<color name="refocus_indicator_2">#ff29b6f6</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d89d0a9..8665459 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -100,6 +100,7 @@
<dimen name="face_circle_stroke">2dip</dimen>
<dimen name="zoom_font_size">14pt</dimen>
<dimen name="shutter_offset">11dp</dimen>
+ <dimen name="shutter_offset_top">2dp</dimen>
<dimen name="size_thumbnail">200dip</dimen>
<dimen name="size_preview">400dip</dimen>
<dimen name="navigation_bar_height">48dip</dimen>
@@ -110,7 +111,7 @@
<dimen name="capture_margin_top">16dip</dimen>
<dimen name="camera_controls_size">0dip</dimen>
<dimen name="camera_film_strip_gap">32dip</dimen>
- <dimen name="shutter_size">80dp</dimen>
+ <dimen name="shutter_size">68dp</dimen>
<dimen name="appwidget_width">180dp</dimen>
<dimen name="appwidget_height">180dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a65538c..966108a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,18 +34,18 @@
<item name="android:windowBackground">@android:color/black</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="android:colorBackgroundCacheHint">@android:color/black</item>
- <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
+ <item name="android:actionBarStyle">@style/Material.ActionBar</item>
</style>
- <style name="Theme.CameraBase" parent="android:Theme.Holo"/>
+ <style name="Theme.CameraBase" parent="android:Theme.Material"/>
<style name="Theme.Crop" parent="Theme.GalleryBase">
<item name="android:displayOptions"></item>
<item name="android:windowContentOverlay">@null</item>
- <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
+ <item name="android:actionBarStyle">@style/Material.ActionBar</item>
<item name="android:colorBackground">@null</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowBackground">@drawable/crop_tiled_background</item>
</style>
- <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar">
+ <style name="Material.ActionBar" parent="android:Widget.Material.ActionBar">
<item name="android:displayOptions">useLogo|showHome|homeAsUp</item>
<item name="android:background">@drawable/actionbar_translucent</item>
<item name="android:backgroundStacked">@null</item>
@@ -110,7 +110,7 @@
<item name="android:layout_gravity">center_vertical</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
- <item name="android:textColor">@color/primary_text</item>
+ <item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/setting_item_text_size</item>
</style>
<style name="SettingRow">
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 941f9d4..874bfab 100755
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -79,10 +79,11 @@
camera:entries="@array/pref_camera_focusmode_entries"
camera:labelList="@array/pref_camera_focusmode_labels"
camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_focustime_key"
camera:defaultValue="@string/pref_camera_focustime_default"
camera:title="@string/pref_camera_focustime_title"
+ camera:singleIcon="@drawable/ic_settings_focus_time"
camera:entries="@array/pref_camera_focustime_duration_entries"
camera:entryValues="@array/pref_camera_focustime_duration_values" />
<ListPreference
@@ -422,10 +423,11 @@
camera:entries="@array/pref_camera_zoom_entries"
camera:entryValues="@array/pref_camera_zoom_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_power_shutter"
camera:defaultValue="@string/pref_camera_power_shutter_default"
camera:title="@string/pref_camera_power_shutter_title"
+ camera:singleIcon="@drawable/ic_settings_powershutter"
camera:entries="@array/pref_switch_entries"
camera:entryValues="@array/pref_switch_entryvalues" />
<IconListPreference
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index da84cae..73e172d 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -67,7 +67,7 @@
camera:key="pref_camera_exposure_key"
camera:defaultValue="@string/pref_exposure_default"
camera:title="@string/pref_exposure_title"
- camera:singleIcon="@drawable/ic_exposure_holo_light" />
+ camera:singleIcon="@drawable/ic_settings_exposure" />
<IconListPreference
camera:key="pref_camera_whitebalance_key"
camera:defaultValue="@string/pref_camera_whitebalance_default"
@@ -207,10 +207,11 @@
camera:title="@string/pref_camera_zoom_title"
camera:entries="@array/pref_camera_zoom_entries"
camera:entryValues="@array/pref_camera_zoom_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_power_shutter"
camera:defaultValue="@string/pref_camera_power_shutter_default"
camera:title="@string/pref_camera_power_shutter_title"
+ camera:singleIcon="@drawable/ic_settings_powershutter"
camera:entries="@array/pref_switch_entries"
camera:entryValues="@array/pref_switch_entryvalues" />
<IconListPreference
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 57fcc40..21d742b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1111,8 +1111,6 @@ public class PhotoModule
return;
}
- mUI.doShutterAnimation();
-
Location loc = getLocationAccordPictureFormat(mParameters.get(KEY_PICTURE_FORMAT));
mLongShotCaptureCount++;
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index c1ccd9b..42d691e 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -677,29 +677,11 @@ public class PhotoUI implements PieListener,
// called from onResume but only the first time
public void initializeFirstTime() {
// Initialize shutter button.
- mShutterButton.setImageResource(R.drawable.shutter_button_anim);
- mShutterButton.setOnClickListener(new OnClickListener()
- {
- @Override
- public void onClick(View v) {
- if (!CameraControls.isAnimating())
- doShutterAnimation();
- if (mController.isImageCaptureIntent()) {
- mCameraControls.setTitleBarVisibility(View.VISIBLE);
- }
- }
- });
-
+ mShutterButton.setImageResource(R.drawable.btn_new_shutter);
mShutterButton.setOnShutterButtonListener(mController);
mShutterButton.setVisibility(View.VISIBLE);
}
- public void doShutterAnimation() {
- AnimationDrawable frameAnimation = (AnimationDrawable) mShutterButton.getDrawable();
- frameAnimation.stop();
- frameAnimation.start();
- }
-
// called from onResume every other time
public void initializeSecondTime(Camera.Parameters params) {
initializeZoom(params);
diff --git a/src/com/android/camera/ShutterButton.java b/src/com/android/camera/ShutterButton.java
index b356580..2222351 100644
--- a/src/com/android/camera/ShutterButton.java
+++ b/src/com/android/camera/ShutterButton.java
@@ -22,14 +22,12 @@ import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
-import com.android.camera.ui.RotateImageView;
-
/**
* A button designed to be used for the on-screen shutter button.
* It's currently an {@code ImageView} that can call a delegate when the
* pressed state changes.
*/
-public class ShutterButton extends RotateImageView {
+public class ShutterButton extends ImageView {
private class LongClickListener implements View.OnLongClickListener {
public boolean onLongClick(View v) {
@@ -84,51 +82,6 @@ public class ShutterButton extends RotateImageView {
setLongClickable(enable);
}
- /**
- * Hook into the drawable state changing to get changes to isPressed -- the
- * onPressed listener doesn't always get called when the pressed state
- * changes.
- */
- @Override
- protected void drawableStateChanged() {
- super.drawableStateChanged();
- final boolean pressed = isPressed();
- if (pressed != mOldPressed) {
- if (!pressed) {
- // When pressing the physical camera button the sequence of
- // events is:
- // focus pressed, optional camera pressed, focus released.
- // We want to emulate this sequence of events with the shutter
- // button. When clicking using a trackball button, the view
- // system changes the drawable state before posting click
- // notification, so the sequence of events is:
- // pressed(true), optional click, pressed(false)
- // When clicking using touch events, the view system changes the
- // drawable state after posting click notification, so the
- // sequence of events is:
- // pressed(true), pressed(false), optional click
- // Since we're emulating the physical camera button, we want to
- // have the same order of events. So we want the optional click
- // callback to be delivered before the pressed(false) callback.
- //
- // To do this, we delay the posting of the pressed(false) event
- // slightly by pushing it on the event queue. This moves it
- // after the optional click notification, so our client always
- // sees events in this sequence:
- // pressed(true), optional click, pressed(false)
- post(new Runnable() {
- @Override
- public void run() {
- callShutterButtonFocus(pressed);
- }
- });
- } else {
- callShutterButtonFocus(pressed);
- }
- mOldPressed = pressed;
- }
- }
-
private void callShutterButtonFocus(boolean pressed) {
if (mListener != null) {
mListener.onShutterButtonFocus(pressed);
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index eb69aa3..30136bd 100755
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -1100,7 +1100,7 @@ public class CameraControls extends RotatableLayout {
View[] views = {
mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
TsMakeupManager.HAS_TS_MAKEUP ? mTsMakeupSwitcher : mHdrSwitcher,mBokehSwitcher,
- mMenu, mShutter, mPreview, mSwitcher, mMute, mReviewRetakeButton,
+ mMenu, mPreview, mSwitcher, mMute, mReviewRetakeButton,
mReviewCancelButton, mReviewDoneButton, mExitPanorama
};
for (View v : views) {
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index d96775d..e9a9a54 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -102,7 +102,7 @@ public class ModuleSwitcher extends RotateImageView
private void init(Context context) {
mItemSize = context.getResources().getDimensionPixelSize(R.dimen.switcher_size);
- mIndicator = context.getResources().getDrawable(R.drawable.ic_switcher_menu_indicator);
+ mIndicator = context.getResources().getDrawable(R.color.transparent);
initializeDrawables(context);
}
diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java
index 236a492..1a0b7ce 100644
--- a/src/com/android/camera/ui/OneUICameraControls.java
+++ b/src/com/android/camera/ui/OneUICameraControls.java
@@ -229,7 +229,7 @@ public class OneUICameraControls extends RotatableLayout {
mViews = new View[]{
mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
- mTsMakeupSwitcher, mFlashButton, mShutter, mPreview, mVideoShutter,
+ mTsMakeupSwitcher, mFlashButton, mPreview, mVideoShutter,
mPauseButton, mCancelButton
};
mBottomLargeSize = getResources().getDimensionPixelSize(
diff --git a/src/com/android/camera/ui/Switch.java b/src/com/android/camera/ui/Switch.java
index 3e7b9bf..68fb365 100644
--- a/src/com/android/camera/ui/Switch.java
+++ b/src/com/android/camera/ui/Switch.java
@@ -123,7 +123,7 @@ public class Switch extends CompoundButton {
mSwitchMinWidth = res.getDimensionPixelSize(R.dimen.switch_min_width);
mSwitchTextMaxWidth = res.getDimensionPixelSize(R.dimen.switch_text_max_width);
mSwitchPadding = res.getDimensionPixelSize(R.dimen.switch_padding);
- setSwitchTextAppearance(context, android.R.style.TextAppearance_Holo_Small);
+ setSwitchTextAppearance(context, android.R.style.TextAppearance_Material_Small);
ViewConfiguration config = ViewConfiguration.get(context);
mTouchSlop = config.getScaledTouchSlop();