summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpike Sprague <spikuru@google.com>2013-12-17 17:31:14 -0800
committerSpike Sprague <spikuru@google.com>2013-12-18 12:16:17 -0800
commitcc0161c31a29848a822377845b5e7ffafeacca61 (patch)
treef93ee8b512917d6096478fc8bfe6b44f4e0ab69a
parentdb44ef57cdb576704b1aafb2b81e30bf9ff261ad (diff)
downloadandroid_packages_apps_Camera2-cc0161c31a29848a822377845b5e7ffafeacca61.tar.gz
android_packages_apps_Camera2-cc0161c31a29848a822377845b5e7ffafeacca61.tar.bz2
android_packages_apps_Camera2-cc0161c31a29848a822377845b5e7ffafeacca61.zip
adding new icon resources
bug: 12128194 Change-Id: I1b34100821113aa7ba996fab3faf14752e766030
-rw-r--r--res/drawable-hdpi/bg_options_indicator.9.pngbin0 -> 1056 bytes
-rw-r--r--res/drawable-hdpi/btn_video_shutter_recording_holo_xlarge.pngbin0 -> 17243 bytes
-rw-r--r--res/drawable-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.pngbin0 -> 21258 bytes
-rw-r--r--res/drawable-hdpi/ic_auto_focus_disabled.pngbin0 -> 335 bytes
-rw-r--r--res/drawable-hdpi/ic_auto_focus_normal.pngbin0 -> 335 bytes
-rw-r--r--res/drawable-hdpi/ic_back_disabled.pngbin0 -> 1061 bytes
-rw-r--r--res/drawable-hdpi/ic_back_normal.pngbin0 -> 1216 bytes
-rw-r--r--res/drawable-hdpi/ic_camera_disabled.pngbin0 -> 1071 bytes
-rw-r--r--res/drawable-hdpi/ic_cancel_disabled.pngbin0 -> 769 bytes
-rw-r--r--res/drawable-hdpi/ic_cancel_normal.pngbin0 -> 657 bytes
-rw-r--r--res/drawable-hdpi/ic_capture_options.pngbin0 -> 511 bytes
-rw-r--r--res/drawable-hdpi/ic_confirm_disabled.pngbin0 -> 791 bytes
-rw-r--r--res/drawable-hdpi/ic_confirm_normal.pngbin0 -> 789 bytes
-rw-r--r--res/drawable-hdpi/ic_craft_disabled.pngbin0 -> 883 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_disabled.pngbin0 -> 1070 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_indicator.pngbin0 -> 982 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_normal.pngbin0 -> 1200 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_disabled.pngbin0 -> 1064 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_indicator.pngbin0 -> 1010 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_normal.pngbin0 -> 1069 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_disabled.pngbin0 -> 895 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_indicator.pngbin0 -> 860 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_normal.pngbin0 -> 976 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_off_disabled.pngbin0 -> 1335 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_off_indicator.pngbin0 -> 1284 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_off_normal.pngbin0 -> 1552 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_on_disabled.pngbin0 -> 1064 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_on_indicator.pngbin0 -> 998 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_plus_on_normal.pngbin0 -> 1269 bytes
-rw-r--r--res/drawable-hdpi/ic_manual_focus_disabled.pngbin0 -> 335 bytes
-rw-r--r--res/drawable-hdpi/ic_manual_focus_normal.pngbin0 -> 335 bytes
-rw-r--r--res/drawable-hdpi/ic_panorama_disabled.pngbin0 -> 1278 bytes
-rw-r--r--res/drawable-hdpi/ic_photo_sphere_disabled.pngbin0 -> 1601 bytes
-rw-r--r--res/drawable-hdpi/ic_play_disabled.pngbin0 -> 906 bytes
-rw-r--r--res/drawable-hdpi/ic_play_normal.pngbin0 -> 1036 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_disabled.pngbin0 -> 1095 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_normal.pngbin0 -> 1211 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_off.pngbin0 -> 1372 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_off_disabled.pngbin0 -> 1246 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_off_indicator.pngbin0 -> 1164 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_off_normal.pngbin0 -> 1323 bytes
-rw-r--r--res/drawable-hdpi/ic_refocus_on_indicator.pngbin0 -> 958 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_disabled.pngbin0 -> 874 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_normal.pngbin1037 -> 1037 bytes
-rw-r--r--res/drawable-hdpi/ic_stop_disabled.pngbin0 -> 469 bytes
-rw-r--r--res/drawable-hdpi/ic_stop_normal.pngbin0 -> 510 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_camera_back_disabled.pngbin0 -> 1160 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_camera_back_normal.pngbin0 -> 1377 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_camera_front_disabled.pngbin0 -> 1296 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_camera_front_normal.pngbin0 -> 1552 bytes
-rw-r--r--res/drawable-hdpi/ic_timelapse_disabled.pngbin0 -> 1311 bytes
-rw-r--r--res/drawable-hdpi/ic_video_disabled.pngbin0 -> 658 bytes
-rw-r--r--res/drawable-hdpi/ic_wide_angle_disabled.pngbin0 -> 874 bytes
-rw-r--r--res/drawable-mdpi/bg_options_indicator.9.pngbin0 -> 766 bytes
-rw-r--r--res/drawable-mdpi/ic_auto_focus_disabled.pngbin0 -> 330 bytes
-rw-r--r--res/drawable-mdpi/ic_auto_focus_normal.pngbin0 -> 330 bytes
-rw-r--r--res/drawable-mdpi/ic_back_disabled.pngbin0 -> 828 bytes
-rw-r--r--res/drawable-mdpi/ic_back_normal.pngbin0 -> 918 bytes
-rw-r--r--res/drawable-mdpi/ic_camera_disabled.pngbin0 -> 765 bytes
-rw-r--r--res/drawable-mdpi/ic_cancel_disabled.pngbin0 -> 624 bytes
-rw-r--r--res/drawable-mdpi/ic_cancel_normal.pngbin0 -> 559 bytes
-rw-r--r--res/drawable-mdpi/ic_capture_options.pngbin0 -> 452 bytes
-rw-r--r--res/drawable-mdpi/ic_confirm_disabled.pngbin0 -> 656 bytes
-rw-r--r--res/drawable-mdpi/ic_confirm_normal.pngbin0 -> 667 bytes
-rw-r--r--res/drawable-mdpi/ic_craft_disabled.pngbin0 -> 570 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_auto_disabled.pngbin0 -> 771 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_auto_indicator.pngbin0 -> 730 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_auto_normal.pngbin0 -> 880 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_off_disabled.pngbin0 -> 786 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_off_indicator.pngbin0 -> 734 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_off_normal.pngbin0 -> 848 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_on_disabled.pngbin0 -> 704 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_on_indicator.pngbin0 -> 660 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_on_normal.pngbin0 -> 737 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_off_disabled.pngbin0 -> 980 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_off_indicator.pngbin0 -> 940 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_off_normal.pngbin0 -> 1115 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_on_disabled.pngbin0 -> 782 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_on_indicator.pngbin0 -> 733 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_plus_on_normal.pngbin0 -> 947 bytes
-rw-r--r--res/drawable-mdpi/ic_manual_focus_disabled.pngbin0 -> 330 bytes
-rw-r--r--res/drawable-mdpi/ic_manual_focus_normal.pngbin0 -> 330 bytes
-rw-r--r--res/drawable-mdpi/ic_panorama_disabled.pngbin0 -> 876 bytes
-rw-r--r--res/drawable-mdpi/ic_photo_sphere_disabled.pngbin0 -> 1014 bytes
-rw-r--r--res/drawable-mdpi/ic_play_disabled.pngbin0 -> 707 bytes
-rw-r--r--res/drawable-mdpi/ic_play_normal.pngbin0 -> 793 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_disabled.pngbin0 -> 787 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_normal.pngbin0 -> 889 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_off.pngbin0 -> 1021 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_off_disabled.pngbin0 -> 900 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_off_indicator.pngbin0 -> 856 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_off_normal.pngbin0 -> 1039 bytes
-rw-r--r--res/drawable-mdpi/ic_refocus_on_indicator.pngbin0 -> 712 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_disabled.pngbin0 -> 836 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_normal.pngbin970 -> 970 bytes
-rw-r--r--res/drawable-mdpi/ic_stop_disabled.pngbin0 -> 420 bytes
-rw-r--r--res/drawable-mdpi/ic_stop_normal.pngbin0 -> 418 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_camera_back_disabled.pngbin0 -> 822 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_camera_back_normal.pngbin0 -> 982 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_camera_front_disabled.pngbin0 -> 936 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_camera_front_normal.pngbin0 -> 1085 bytes
-rw-r--r--res/drawable-mdpi/ic_timelapse_disabled.pngbin0 -> 928 bytes
-rw-r--r--res/drawable-mdpi/ic_video_disabled.pngbin0 -> 547 bytes
-rw-r--r--res/drawable-mdpi/ic_wide_angle_disabled.pngbin0 -> 662 bytes
-rw-r--r--res/drawable-xhdpi/bg_options_indicator.9.pngbin0 -> 1684 bytes
-rw-r--r--res/drawable-xhdpi/ic_auto_focus_disabled.pngbin0 -> 343 bytes
-rw-r--r--res/drawable-xhdpi/ic_auto_focus_normal.pngbin0 -> 343 bytes
-rw-r--r--res/drawable-xhdpi/ic_back_disabled.pngbin0 -> 1330 bytes
-rw-r--r--res/drawable-xhdpi/ic_back_normal.pngbin0 -> 1541 bytes
-rw-r--r--res/drawable-xhdpi/ic_camera_disabled.pngbin0 -> 1406 bytes
-rw-r--r--res/drawable-xhdpi/ic_cancel_disabled.pngbin0 -> 1007 bytes
-rw-r--r--res/drawable-xhdpi/ic_cancel_normal.pngbin0 -> 777 bytes
-rw-r--r--res/drawable-xhdpi/ic_capture_options.pngbin0 -> 626 bytes
-rw-r--r--res/drawable-xhdpi/ic_confirm_disabled.pngbin0 -> 1118 bytes
-rw-r--r--res/drawable-xhdpi/ic_confirm_normal.pngbin0 -> 1067 bytes
-rw-r--r--res/drawable-xhdpi/ic_craft_disabled.pngbin0 -> 766 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_auto_disabled.pngbin0 -> 1358 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_auto_indicator.pngbin0 -> 1285 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_auto_normal.pngbin0 -> 1593 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_off_disabled.pngbin0 -> 1279 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_off_indicator.pngbin0 -> 1251 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_off_normal.pngbin0 -> 1381 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_on_disabled.pngbin0 -> 1092 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_on_indicator.pngbin0 -> 1047 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_on_normal.pngbin0 -> 1245 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_off_disabled.pngbin0 -> 1704 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_off_indicator.pngbin0 -> 1692 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_off_normal.pngbin0 -> 2073 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_on_disabled.pngbin0 -> 1358 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_on_indicator.pngbin0 -> 1334 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_plus_on_normal.pngbin0 -> 1716 bytes
-rw-r--r--res/drawable-xhdpi/ic_manual_focus_disabled.pngbin0 -> 343 bytes
-rw-r--r--res/drawable-xhdpi/ic_manual_focus_normal.pngbin0 -> 343 bytes
-rw-r--r--res/drawable-xhdpi/ic_panorama_disabled.pngbin0 -> 1582 bytes
-rw-r--r--res/drawable-xhdpi/ic_photo_sphere_disabled.pngbin0 -> 2118 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_disabled.pngbin0 -> 1097 bytes
-rw-r--r--res/drawable-xhdpi/ic_play_normal.pngbin0 -> 1219 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_disabled.pngbin0 -> 1359 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_normal.pngbin0 -> 1558 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_off.pngbin0 -> 1807 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_off_disabled.pngbin0 -> 1642 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_off_indicator.pngbin0 -> 1567 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_off_normal.pngbin0 -> 1768 bytes
-rw-r--r--res/drawable-xhdpi/ic_refocus_on_indicator.pngbin0 -> 1266 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_disabled.pngbin0 -> 1255 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_normal.pngbin1577 -> 1577 bytes
-rw-r--r--res/drawable-xhdpi/ic_stop_disabled.pngbin0 -> 529 bytes
-rw-r--r--res/drawable-xhdpi/ic_stop_normal.pngbin0 -> 577 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_camera_back_disabled.pngbin0 -> 1517 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_camera_back_normal.pngbin0 -> 1770 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_camera_front_disabled.pngbin0 -> 1700 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_camera_front_normal.pngbin0 -> 2069 bytes
-rw-r--r--res/drawable-xhdpi/ic_timelapse_disabled.pngbin0 -> 1742 bytes
-rw-r--r--res/drawable-xhdpi/ic_video_disabled.pngbin0 -> 809 bytes
-rw-r--r--res/drawable-xhdpi/ic_wide_angle_disabled.pngbin0 -> 1048 bytes
-rw-r--r--res/drawable-xxhdpi/bg_options_indicator.9.pngbin0 -> 2989 bytes
-rw-r--r--res/drawable-xxhdpi/ic_auto_focus_disabled.pngbin0 -> 1129 bytes
-rw-r--r--res/drawable-xxhdpi/ic_auto_focus_normal.pngbin0 -> 1135 bytes
-rw-r--r--res/drawable-xxhdpi/ic_back_disabled.pngbin0 -> 1980 bytes
-rw-r--r--res/drawable-xxhdpi/ic_back_normal.pngbin0 -> 2181 bytes
-rw-r--r--res/drawable-xxhdpi/ic_camera_disabled.pngbin0 -> 2152 bytes
-rw-r--r--res/drawable-xxhdpi/ic_cancel_disabled.pngbin0 -> 1599 bytes
-rw-r--r--res/drawable-xxhdpi/ic_cancel_normal.pngbin0 -> 1491 bytes
-rw-r--r--res/drawable-xxhdpi/ic_capture_options.pngbin0 -> 1394 bytes
-rw-r--r--res/drawable-xxhdpi/ic_confirm_disabled.pngbin0 -> 1740 bytes
-rw-r--r--res/drawable-xxhdpi/ic_confirm_normal.pngbin0 -> 1628 bytes
-rw-r--r--res/drawable-xxhdpi/ic_craft_disabled.pngbin0 -> 1249 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_auto_disabled.pngbin0 -> 2033 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_auto_indicator.pngbin0 -> 1877 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_auto_normal.pngbin0 -> 2266 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_off_disabled.pngbin0 -> 1955 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_off_indicator.pngbin0 -> 1809 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_off_normal.pngbin0 -> 2102 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_on_disabled.pngbin0 -> 1762 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_on_indicator.pngbin0 -> 1648 bytes
-rw-r--r--res/drawable-xxhdpi/ic_flash_on_normal.pngbin0 -> 1987 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_off_disabled.pngbin0 -> 2227 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_off_indicator.pngbin0 -> 2076 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_off_normal.pngbin0 -> 2287 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_on_disabled.pngbin0 -> 1924 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_on_indicator.pngbin0 -> 1827 bytes
-rw-r--r--res/drawable-xxhdpi/ic_hdr_plus_on_normal.pngbin0 -> 2042 bytes
-rw-r--r--res/drawable-xxhdpi/ic_manual_focus_disabled.pngbin0 -> 1135 bytes
-rw-r--r--res/drawable-xxhdpi/ic_manual_focus_normal.pngbin0 -> 1135 bytes
-rw-r--r--res/drawable-xxhdpi/ic_panorama_disabled.pngbin0 -> 2130 bytes
-rw-r--r--res/drawable-xxhdpi/ic_photo_sphere_disabled.pngbin0 -> 3032 bytes
-rw-r--r--res/drawable-xxhdpi/ic_play_disabled.pngbin0 -> 1773 bytes
-rw-r--r--res/drawable-xxhdpi/ic_play_normal.pngbin0 -> 1875 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_disabled.pngbin0 -> 2102 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_normal.pngbin0 -> 2295 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_off.pngbin0 -> 2324 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_off_disabled.pngbin0 -> 2194 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_off_indicator.pngbin0 -> 2018 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_off_normal.pngbin0 -> 2199 bytes
-rw-r--r--res/drawable-xxhdpi/ic_refocus_on_indicator.pngbin0 -> 1903 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings_disabled.pngbin0 -> 1599 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings_normal.pngbin1595 -> 1615 bytes
-rw-r--r--res/drawable-xxhdpi/ic_stop_disabled.pngbin0 -> 1184 bytes
-rw-r--r--res/drawable-xxhdpi/ic_stop_normal.pngbin0 -> 1185 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_camera_back_disabled.pngbin0 -> 2311 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_camera_back_normal.pngbin0 -> 2502 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_camera_front_disabled.pngbin0 -> 2456 bytes
-rw-r--r--res/drawable-xxhdpi/ic_switch_camera_front_normal.pngbin0 -> 2692 bytes
-rw-r--r--res/drawable-xxhdpi/ic_timelapse_disabled.pngbin0 -> 2425 bytes
-rw-r--r--res/drawable-xxhdpi/ic_video_disabled.pngbin0 -> 1487 bytes
-rw-r--r--res/drawable-xxhdpi/ic_wide_angle_disabled.pngbin0 -> 1666 bytes
-rw-r--r--res/drawable/ic_auto_focus.xml21
-rw-r--r--res/drawable/ic_back.xml21
-rw-r--r--res/drawable/ic_camera.xml21
-rw-r--r--res/drawable/ic_cancel.xml21
-rw-r--r--res/drawable/ic_confirm.xml21
-rw-r--r--res/drawable/ic_craft.xml21
-rw-r--r--res/drawable/ic_flash_auto.xml21
-rw-r--r--res/drawable/ic_flash_off.xml21
-rw-r--r--res/drawable/ic_flash_on.xml21
-rw-r--r--res/drawable/ic_hdr_plus_off.xml21
-rw-r--r--res/drawable/ic_hdr_plus_on.xml21
-rw-r--r--res/drawable/ic_manual_focus.xml21
-rw-r--r--res/drawable/ic_panorama.xml21
-rw-r--r--res/drawable/ic_photo_sphere.xml21
-rw-r--r--res/drawable/ic_play.xml21
-rw-r--r--res/drawable/ic_refocus.xml21
-rw-r--r--res/drawable/ic_refocus_off.xml21
-rw-r--r--res/drawable/ic_settings.xml21
-rw-r--r--res/drawable/ic_stop.xml21
-rw-r--r--res/drawable/ic_switch_camera_back.xml21
-rw-r--r--res/drawable/ic_switch_camera_front.xml21
-rw-r--r--res/drawable/ic_timelapse.xml21
-rw-r--r--res/drawable/ic_video.xml21
-rw-r--r--res/drawable/ic_wide_angle.xml21
-rw-r--r--res/layout/photo_intent_bottombar_buttons.xml2
-rw-r--r--res/layout/photo_intent_review_bottombar_buttons.xml6
-rw-r--r--res/layout/video_intent_bottombar_buttons.xml2
-rw-r--r--res/layout/video_intent_review_bottombar_buttons.xml6
-rw-r--r--res/mipmap-hdpi/ic_launcher_camera_dogfood.pngbin0 -> 7876 bytes
-rw-r--r--res/mipmap-hdpi/ic_launcher_camera_fishfood.pngbin0 -> 7841 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_camera_dogfood.pngbin0 -> 4334 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_camera_fishfood.pngbin0 -> 4334 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_camera_dogfood.pngbin0 -> 12473 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_camera_fishfood.pngbin0 -> 12472 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_camera_dogfood.pngbin0 -> 23870 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_camera_fishfood.pngbin0 -> 23840 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_camera_dogfood.pngbin0 -> 36801 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_camera_fishfood.pngbin0 -> 37008 bytes
-rw-r--r--res/values/arrays.xml33
-rw-r--r--res/xml/camera_preferences.xml110
-rw-r--r--res/xml/video_preferences.xml74
-rw-r--r--src/com/android/camera/ButtonManager.java4
-rw-r--r--src/com/android/camera/ui/ModeListView.java14
249 files changed, 537 insertions, 218 deletions
diff --git a/res/drawable-hdpi/bg_options_indicator.9.png b/res/drawable-hdpi/bg_options_indicator.9.png
new file mode 100644
index 000000000..30c1cb568
--- /dev/null
+++ b/res/drawable-hdpi/bg_options_indicator.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_video_shutter_recording_holo_xlarge.png b/res/drawable-hdpi/btn_video_shutter_recording_holo_xlarge.png
new file mode 100644
index 000000000..c9b2da3a2
--- /dev/null
+++ b/res/drawable-hdpi/btn_video_shutter_recording_holo_xlarge.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
new file mode 100644
index 000000000..864aa1f9b
--- /dev/null
+++ b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_auto_focus_disabled.png b/res/drawable-hdpi/ic_auto_focus_disabled.png
new file mode 100644
index 000000000..6a6ae643e
--- /dev/null
+++ b/res/drawable-hdpi/ic_auto_focus_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_auto_focus_normal.png b/res/drawable-hdpi/ic_auto_focus_normal.png
new file mode 100644
index 000000000..6a6ae643e
--- /dev/null
+++ b/res/drawable-hdpi/ic_auto_focus_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_disabled.png b/res/drawable-hdpi/ic_back_disabled.png
new file mode 100644
index 000000000..6f4e80465
--- /dev/null
+++ b/res/drawable-hdpi/ic_back_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_normal.png b/res/drawable-hdpi/ic_back_normal.png
new file mode 100644
index 000000000..1800f1086
--- /dev/null
+++ b/res/drawable-hdpi/ic_back_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_camera_disabled.png b/res/drawable-hdpi/ic_camera_disabled.png
new file mode 100644
index 000000000..2486cba2c
--- /dev/null
+++ b/res/drawable-hdpi/ic_camera_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_cancel_disabled.png b/res/drawable-hdpi/ic_cancel_disabled.png
new file mode 100644
index 000000000..92818cb44
--- /dev/null
+++ b/res/drawable-hdpi/ic_cancel_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_cancel_normal.png b/res/drawable-hdpi/ic_cancel_normal.png
new file mode 100644
index 000000000..329ce706f
--- /dev/null
+++ b/res/drawable-hdpi/ic_cancel_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_capture_options.png b/res/drawable-hdpi/ic_capture_options.png
new file mode 100644
index 000000000..4ab5ef1e6
--- /dev/null
+++ b/res/drawable-hdpi/ic_capture_options.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_confirm_disabled.png b/res/drawable-hdpi/ic_confirm_disabled.png
new file mode 100644
index 000000000..5bbdcc44c
--- /dev/null
+++ b/res/drawable-hdpi/ic_confirm_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_confirm_normal.png b/res/drawable-hdpi/ic_confirm_normal.png
new file mode 100644
index 000000000..d920d6f4a
--- /dev/null
+++ b/res/drawable-hdpi/ic_confirm_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_craft_disabled.png b/res/drawable-hdpi/ic_craft_disabled.png
new file mode 100644
index 000000000..1e39d4a77
--- /dev/null
+++ b/res/drawable-hdpi/ic_craft_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_auto_disabled.png b/res/drawable-hdpi/ic_flash_auto_disabled.png
new file mode 100644
index 000000000..f0ecb70aa
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_auto_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_auto_indicator.png b/res/drawable-hdpi/ic_flash_auto_indicator.png
new file mode 100644
index 000000000..9383da099
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_auto_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_auto_normal.png b/res/drawable-hdpi/ic_flash_auto_normal.png
new file mode 100644
index 000000000..0c8a863ac
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_auto_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_off_disabled.png b/res/drawable-hdpi/ic_flash_off_disabled.png
new file mode 100644
index 000000000..d007bb1d4
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_off_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_off_indicator.png b/res/drawable-hdpi/ic_flash_off_indicator.png
new file mode 100644
index 000000000..f88f7449d
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_off_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_off_normal.png b/res/drawable-hdpi/ic_flash_off_normal.png
new file mode 100644
index 000000000..5630e71e8
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_off_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_on_disabled.png b/res/drawable-hdpi/ic_flash_on_disabled.png
new file mode 100644
index 000000000..930466518
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_on_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_on_indicator.png b/res/drawable-hdpi/ic_flash_on_indicator.png
new file mode 100644
index 000000000..86eb1759c
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_on_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_on_normal.png b/res/drawable-hdpi/ic_flash_on_normal.png
new file mode 100644
index 000000000..926f386d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_flash_on_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_off_disabled.png b/res/drawable-hdpi/ic_hdr_plus_off_disabled.png
new file mode 100644
index 000000000..db0ab2579
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_off_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_off_indicator.png b/res/drawable-hdpi/ic_hdr_plus_off_indicator.png
new file mode 100644
index 000000000..0f9f24a12
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_off_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_off_normal.png b/res/drawable-hdpi/ic_hdr_plus_off_normal.png
new file mode 100644
index 000000000..51d073a27
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_off_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_on_disabled.png b/res/drawable-hdpi/ic_hdr_plus_on_disabled.png
new file mode 100644
index 000000000..c286eef6d
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_on_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_on_indicator.png b/res/drawable-hdpi/ic_hdr_plus_on_indicator.png
new file mode 100644
index 000000000..58802361a
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_on_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_plus_on_normal.png b/res/drawable-hdpi/ic_hdr_plus_on_normal.png
new file mode 100644
index 000000000..8dfeadd80
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_on_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_manual_focus_disabled.png b/res/drawable-hdpi/ic_manual_focus_disabled.png
new file mode 100644
index 000000000..6a6ae643e
--- /dev/null
+++ b/res/drawable-hdpi/ic_manual_focus_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_manual_focus_normal.png b/res/drawable-hdpi/ic_manual_focus_normal.png
new file mode 100644
index 000000000..6a6ae643e
--- /dev/null
+++ b/res/drawable-hdpi/ic_manual_focus_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_panorama_disabled.png b/res/drawable-hdpi/ic_panorama_disabled.png
new file mode 100644
index 000000000..b07472122
--- /dev/null
+++ b/res/drawable-hdpi/ic_panorama_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_photo_sphere_disabled.png b/res/drawable-hdpi/ic_photo_sphere_disabled.png
new file mode 100644
index 000000000..01df5b956
--- /dev/null
+++ b/res/drawable-hdpi/ic_photo_sphere_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_disabled.png b/res/drawable-hdpi/ic_play_disabled.png
new file mode 100644
index 000000000..7c9158d73
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_play_normal.png b/res/drawable-hdpi/ic_play_normal.png
new file mode 100644
index 000000000..748094eb4
--- /dev/null
+++ b/res/drawable-hdpi/ic_play_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_disabled.png b/res/drawable-hdpi/ic_refocus_disabled.png
new file mode 100644
index 000000000..d3581b64c
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_normal.png b/res/drawable-hdpi/ic_refocus_normal.png
new file mode 100644
index 000000000..59268add2
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_off.png b/res/drawable-hdpi/ic_refocus_off.png
new file mode 100644
index 000000000..7ed9f9526
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_off_disabled.png b/res/drawable-hdpi/ic_refocus_off_disabled.png
new file mode 100644
index 000000000..a64f730e2
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_off_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_off_indicator.png b/res/drawable-hdpi/ic_refocus_off_indicator.png
new file mode 100644
index 000000000..50bb770a5
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_off_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_off_normal.png b/res/drawable-hdpi/ic_refocus_off_normal.png
new file mode 100644
index 000000000..93d802375
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_off_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_refocus_on_indicator.png b/res/drawable-hdpi/ic_refocus_on_indicator.png
new file mode 100644
index 000000000..15b4d6376
--- /dev/null
+++ b/res/drawable-hdpi/ic_refocus_on_indicator.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_disabled.png b/res/drawable-hdpi/ic_settings_disabled.png
new file mode 100644
index 000000000..990e41a5f
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_normal.png b/res/drawable-hdpi/ic_settings_normal.png
index 51c559c62..ffd33c678 100644
--- a/res/drawable-hdpi/ic_settings_normal.png
+++ b/res/drawable-hdpi/ic_settings_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop_disabled.png b/res/drawable-hdpi/ic_stop_disabled.png
new file mode 100644
index 000000000..daa7a3ad2
--- /dev/null
+++ b/res/drawable-hdpi/ic_stop_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop_normal.png b/res/drawable-hdpi/ic_stop_normal.png
new file mode 100644
index 000000000..0c148a9c4
--- /dev/null
+++ b/res/drawable-hdpi/ic_stop_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera_back_disabled.png b/res/drawable-hdpi/ic_switch_camera_back_disabled.png
new file mode 100644
index 000000000..1de4c6fae
--- /dev/null
+++ b/res/drawable-hdpi/ic_switch_camera_back_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera_back_normal.png b/res/drawable-hdpi/ic_switch_camera_back_normal.png
new file mode 100644
index 000000000..5586c0610
--- /dev/null
+++ b/res/drawable-hdpi/ic_switch_camera_back_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera_front_disabled.png b/res/drawable-hdpi/ic_switch_camera_front_disabled.png
new file mode 100644
index 000000000..6d3902e88
--- /dev/null
+++ b/res/drawable-hdpi/ic_switch_camera_front_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_camera_front_normal.png b/res/drawable-hdpi/ic_switch_camera_front_normal.png
new file mode 100644
index 000000000..3569dd5ea
--- /dev/null
+++ b/res/drawable-hdpi/ic_switch_camera_front_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timelapse_disabled.png b/res/drawable-hdpi/ic_timelapse_disabled.png
new file mode 100644
index 000000000..ff636ae4e
--- /dev/null
+++ b/res/drawable-hdpi/ic_timelapse_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_video_disabled.png b/res/drawable-hdpi/ic_video_disabled.png
new file mode 100644
index 000000000..093fb8c6e
--- /dev/null
+++ b/res/drawable-hdpi/ic_video_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wide_angle_disabled.png b/res/drawable-hdpi/ic_wide_angle_disabled.png
new file mode 100644
index 000000000..69f0761a8
--- /dev/null
+++ b/res/drawable-hdpi/ic_wide_angle_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_options_indicator.9.png b/res/drawable-mdpi/bg_options_indicator.9.png
new file mode 100644
index 000000000..c79095b87
--- /dev/null
+++ b/res/drawable-mdpi/bg_options_indicator.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_auto_focus_disabled.png b/res/drawable-mdpi/ic_auto_focus_disabled.png
new file mode 100644
index 000000000..62c4926f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_auto_focus_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_auto_focus_normal.png b/res/drawable-mdpi/ic_auto_focus_normal.png
new file mode 100644
index 000000000..62c4926f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_auto_focus_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_disabled.png b/res/drawable-mdpi/ic_back_disabled.png
new file mode 100644
index 000000000..773589a3e
--- /dev/null
+++ b/res/drawable-mdpi/ic_back_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_normal.png b/res/drawable-mdpi/ic_back_normal.png
new file mode 100644
index 000000000..d326323c3
--- /dev/null
+++ b/res/drawable-mdpi/ic_back_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_camera_disabled.png b/res/drawable-mdpi/ic_camera_disabled.png
new file mode 100644
index 000000000..9d569edef
--- /dev/null
+++ b/res/drawable-mdpi/ic_camera_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_cancel_disabled.png b/res/drawable-mdpi/ic_cancel_disabled.png
new file mode 100644
index 000000000..fa1d4c9ed
--- /dev/null
+++ b/res/drawable-mdpi/ic_cancel_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_cancel_normal.png b/res/drawable-mdpi/ic_cancel_normal.png
new file mode 100644
index 000000000..fd36c4b67
--- /dev/null
+++ b/res/drawable-mdpi/ic_cancel_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_capture_options.png b/res/drawable-mdpi/ic_capture_options.png
new file mode 100644
index 000000000..f05ee8e80
--- /dev/null
+++ b/res/drawable-mdpi/ic_capture_options.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_confirm_disabled.png b/res/drawable-mdpi/ic_confirm_disabled.png
new file mode 100644
index 000000000..cc18158c8
--- /dev/null
+++ b/res/drawable-mdpi/ic_confirm_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_confirm_normal.png b/res/drawable-mdpi/ic_confirm_normal.png
new file mode 100644
index 000000000..44d7ef3cd
--- /dev/null
+++ b/res/drawable-mdpi/ic_confirm_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_craft_disabled.png b/res/drawable-mdpi/ic_craft_disabled.png
new file mode 100644
index 000000000..23d207d04
--- /dev/null
+++ b/res/drawable-mdpi/ic_craft_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_auto_disabled.png b/res/drawable-mdpi/ic_flash_auto_disabled.png
new file mode 100644
index 000000000..084ee2297
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_auto_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_auto_indicator.png b/res/drawable-mdpi/ic_flash_auto_indicator.png
new file mode 100644
index 000000000..eb0e6f241
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_auto_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_auto_normal.png b/res/drawable-mdpi/ic_flash_auto_normal.png
new file mode 100644
index 000000000..5b071a318
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_auto_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_off_disabled.png b/res/drawable-mdpi/ic_flash_off_disabled.png
new file mode 100644
index 000000000..67bd6c6f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_off_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_off_indicator.png b/res/drawable-mdpi/ic_flash_off_indicator.png
new file mode 100644
index 000000000..95fb9980a
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_off_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_off_normal.png b/res/drawable-mdpi/ic_flash_off_normal.png
new file mode 100644
index 000000000..ade4ec50e
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_off_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_on_disabled.png b/res/drawable-mdpi/ic_flash_on_disabled.png
new file mode 100644
index 000000000..f935371a3
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_on_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_on_indicator.png b/res/drawable-mdpi/ic_flash_on_indicator.png
new file mode 100644
index 000000000..769be461e
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_on_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_on_normal.png b/res/drawable-mdpi/ic_flash_on_normal.png
new file mode 100644
index 000000000..e0545f284
--- /dev/null
+++ b/res/drawable-mdpi/ic_flash_on_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_off_disabled.png b/res/drawable-mdpi/ic_hdr_plus_off_disabled.png
new file mode 100644
index 000000000..ca4f3d7e6
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_off_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_off_indicator.png b/res/drawable-mdpi/ic_hdr_plus_off_indicator.png
new file mode 100644
index 000000000..0005639b6
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_off_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_off_normal.png b/res/drawable-mdpi/ic_hdr_plus_off_normal.png
new file mode 100644
index 000000000..9b82f20c9
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_off_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_on_disabled.png b/res/drawable-mdpi/ic_hdr_plus_on_disabled.png
new file mode 100644
index 000000000..320b3ed52
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_on_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_on_indicator.png b/res/drawable-mdpi/ic_hdr_plus_on_indicator.png
new file mode 100644
index 000000000..454ffc2dd
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_on_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_plus_on_normal.png b/res/drawable-mdpi/ic_hdr_plus_on_normal.png
new file mode 100644
index 000000000..e891a3e69
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_on_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_manual_focus_disabled.png b/res/drawable-mdpi/ic_manual_focus_disabled.png
new file mode 100644
index 000000000..62c4926f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_manual_focus_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_manual_focus_normal.png b/res/drawable-mdpi/ic_manual_focus_normal.png
new file mode 100644
index 000000000..62c4926f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_manual_focus_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_panorama_disabled.png b/res/drawable-mdpi/ic_panorama_disabled.png
new file mode 100644
index 000000000..69f2ec478
--- /dev/null
+++ b/res/drawable-mdpi/ic_panorama_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_photo_sphere_disabled.png b/res/drawable-mdpi/ic_photo_sphere_disabled.png
new file mode 100644
index 000000000..8bdc68010
--- /dev/null
+++ b/res/drawable-mdpi/ic_photo_sphere_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_disabled.png b/res/drawable-mdpi/ic_play_disabled.png
new file mode 100644
index 000000000..5dd5f34ed
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_play_normal.png b/res/drawable-mdpi/ic_play_normal.png
new file mode 100644
index 000000000..a0add5827
--- /dev/null
+++ b/res/drawable-mdpi/ic_play_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_disabled.png b/res/drawable-mdpi/ic_refocus_disabled.png
new file mode 100644
index 000000000..4fc346d5b
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_normal.png b/res/drawable-mdpi/ic_refocus_normal.png
new file mode 100644
index 000000000..11feacfa8
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_off.png b/res/drawable-mdpi/ic_refocus_off.png
new file mode 100644
index 000000000..9881ff54d
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_off_disabled.png b/res/drawable-mdpi/ic_refocus_off_disabled.png
new file mode 100644
index 000000000..ad35a6032
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_off_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_off_indicator.png b/res/drawable-mdpi/ic_refocus_off_indicator.png
new file mode 100644
index 000000000..502f6274b
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_off_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_off_normal.png b/res/drawable-mdpi/ic_refocus_off_normal.png
new file mode 100644
index 000000000..ae3cebb20
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_off_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_refocus_on_indicator.png b/res/drawable-mdpi/ic_refocus_on_indicator.png
new file mode 100644
index 000000000..9d491d1a4
--- /dev/null
+++ b/res/drawable-mdpi/ic_refocus_on_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_disabled.png b/res/drawable-mdpi/ic_settings_disabled.png
new file mode 100644
index 000000000..ff0fd53e5
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_normal.png b/res/drawable-mdpi/ic_settings_normal.png
index cac3ab0d4..bbe6ebe73 100644
--- a/res/drawable-mdpi/ic_settings_normal.png
+++ b/res/drawable-mdpi/ic_settings_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop_disabled.png b/res/drawable-mdpi/ic_stop_disabled.png
new file mode 100644
index 000000000..1cb7391db
--- /dev/null
+++ b/res/drawable-mdpi/ic_stop_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop_normal.png b/res/drawable-mdpi/ic_stop_normal.png
new file mode 100644
index 000000000..f22a428de
--- /dev/null
+++ b/res/drawable-mdpi/ic_stop_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera_back_disabled.png b/res/drawable-mdpi/ic_switch_camera_back_disabled.png
new file mode 100644
index 000000000..2835252ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_switch_camera_back_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera_back_normal.png b/res/drawable-mdpi/ic_switch_camera_back_normal.png
new file mode 100644
index 000000000..627e8903b
--- /dev/null
+++ b/res/drawable-mdpi/ic_switch_camera_back_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera_front_disabled.png b/res/drawable-mdpi/ic_switch_camera_front_disabled.png
new file mode 100644
index 000000000..80a1b8ac3
--- /dev/null
+++ b/res/drawable-mdpi/ic_switch_camera_front_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_camera_front_normal.png b/res/drawable-mdpi/ic_switch_camera_front_normal.png
new file mode 100644
index 000000000..fe6f789a6
--- /dev/null
+++ b/res/drawable-mdpi/ic_switch_camera_front_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timelapse_disabled.png b/res/drawable-mdpi/ic_timelapse_disabled.png
new file mode 100644
index 000000000..adb7ad5b3
--- /dev/null
+++ b/res/drawable-mdpi/ic_timelapse_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_video_disabled.png b/res/drawable-mdpi/ic_video_disabled.png
new file mode 100644
index 000000000..5efcf0bfe
--- /dev/null
+++ b/res/drawable-mdpi/ic_video_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wide_angle_disabled.png b/res/drawable-mdpi/ic_wide_angle_disabled.png
new file mode 100644
index 000000000..ad7b7c1e8
--- /dev/null
+++ b/res/drawable-mdpi/ic_wide_angle_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/bg_options_indicator.9.png b/res/drawable-xhdpi/bg_options_indicator.9.png
new file mode 100644
index 000000000..3dc347ebf
--- /dev/null
+++ b/res/drawable-xhdpi/bg_options_indicator.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_auto_focus_disabled.png b/res/drawable-xhdpi/ic_auto_focus_disabled.png
new file mode 100644
index 000000000..9ea69440f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_auto_focus_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_auto_focus_normal.png b/res/drawable-xhdpi/ic_auto_focus_normal.png
new file mode 100644
index 000000000..9ea69440f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_auto_focus_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_disabled.png b/res/drawable-xhdpi/ic_back_disabled.png
new file mode 100644
index 000000000..50724465d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_back_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_normal.png b/res/drawable-xhdpi/ic_back_normal.png
new file mode 100644
index 000000000..08a77f384
--- /dev/null
+++ b/res/drawable-xhdpi/ic_back_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_camera_disabled.png b/res/drawable-xhdpi/ic_camera_disabled.png
new file mode 100644
index 000000000..89ea31dfe
--- /dev/null
+++ b/res/drawable-xhdpi/ic_camera_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_cancel_disabled.png b/res/drawable-xhdpi/ic_cancel_disabled.png
new file mode 100644
index 000000000..a2760ef4f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_cancel_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_cancel_normal.png b/res/drawable-xhdpi/ic_cancel_normal.png
new file mode 100644
index 000000000..0fee1707f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_cancel_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_capture_options.png b/res/drawable-xhdpi/ic_capture_options.png
new file mode 100644
index 000000000..c5850e821
--- /dev/null
+++ b/res/drawable-xhdpi/ic_capture_options.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_confirm_disabled.png b/res/drawable-xhdpi/ic_confirm_disabled.png
new file mode 100644
index 000000000..4bcfe9c52
--- /dev/null
+++ b/res/drawable-xhdpi/ic_confirm_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_confirm_normal.png b/res/drawable-xhdpi/ic_confirm_normal.png
new file mode 100644
index 000000000..230f01c03
--- /dev/null
+++ b/res/drawable-xhdpi/ic_confirm_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_craft_disabled.png b/res/drawable-xhdpi/ic_craft_disabled.png
new file mode 100644
index 000000000..b7eaf104e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_craft_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_disabled.png b/res/drawable-xhdpi/ic_flash_auto_disabled.png
new file mode 100644
index 000000000..331812a69
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_auto_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_indicator.png b/res/drawable-xhdpi/ic_flash_auto_indicator.png
new file mode 100644
index 000000000..de15956c5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_auto_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_normal.png b/res/drawable-xhdpi/ic_flash_auto_normal.png
new file mode 100644
index 000000000..b1067c9be
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_auto_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_off_disabled.png b/res/drawable-xhdpi/ic_flash_off_disabled.png
new file mode 100644
index 000000000..5cbabadec
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_off_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_off_indicator.png b/res/drawable-xhdpi/ic_flash_off_indicator.png
new file mode 100644
index 000000000..ab69b3c89
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_off_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_off_normal.png b/res/drawable-xhdpi/ic_flash_off_normal.png
new file mode 100644
index 000000000..b4789e3d8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_off_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_on_disabled.png b/res/drawable-xhdpi/ic_flash_on_disabled.png
new file mode 100644
index 000000000..8aaa2e319
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_on_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_on_indicator.png b/res/drawable-xhdpi/ic_flash_on_indicator.png
new file mode 100644
index 000000000..f88f09991
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_on_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_on_normal.png b/res/drawable-xhdpi/ic_flash_on_normal.png
new file mode 100644
index 000000000..e86b30170
--- /dev/null
+++ b/res/drawable-xhdpi/ic_flash_on_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png
new file mode 100644
index 000000000..005cbabb4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png b/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png
new file mode 100644
index 000000000..53b209df7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_normal.png b/res/drawable-xhdpi/ic_hdr_plus_off_normal.png
new file mode 100644
index 000000000..5d5d76267
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_off_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png
new file mode 100644
index 000000000..78e61d69f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png b/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png
new file mode 100644
index 000000000..1fa189727
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_normal.png b/res/drawable-xhdpi/ic_hdr_plus_on_normal.png
new file mode 100644
index 000000000..ad2891940
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_on_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_manual_focus_disabled.png b/res/drawable-xhdpi/ic_manual_focus_disabled.png
new file mode 100644
index 000000000..9ea69440f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_manual_focus_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_manual_focus_normal.png b/res/drawable-xhdpi/ic_manual_focus_normal.png
new file mode 100644
index 000000000..9ea69440f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_manual_focus_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_panorama_disabled.png b/res/drawable-xhdpi/ic_panorama_disabled.png
new file mode 100644
index 000000000..9b074051d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_panorama_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_photo_sphere_disabled.png b/res/drawable-xhdpi/ic_photo_sphere_disabled.png
new file mode 100644
index 000000000..558bbe9a7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_photo_sphere_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_disabled.png b/res/drawable-xhdpi/ic_play_disabled.png
new file mode 100644
index 000000000..306af29eb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_play_normal.png b/res/drawable-xhdpi/ic_play_normal.png
new file mode 100644
index 000000000..45e285079
--- /dev/null
+++ b/res/drawable-xhdpi/ic_play_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_disabled.png b/res/drawable-xhdpi/ic_refocus_disabled.png
new file mode 100644
index 000000000..dda381857
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_normal.png b/res/drawable-xhdpi/ic_refocus_normal.png
new file mode 100644
index 000000000..20410c484
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_off.png b/res/drawable-xhdpi/ic_refocus_off.png
new file mode 100644
index 000000000..2f235ce5b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_off_disabled.png b/res/drawable-xhdpi/ic_refocus_off_disabled.png
new file mode 100644
index 000000000..b46cf1af2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_off_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_off_indicator.png b/res/drawable-xhdpi/ic_refocus_off_indicator.png
new file mode 100644
index 000000000..39f8f168a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_off_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_off_normal.png b/res/drawable-xhdpi/ic_refocus_off_normal.png
new file mode 100644
index 000000000..b59c76d1b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_off_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refocus_on_indicator.png b/res/drawable-xhdpi/ic_refocus_on_indicator.png
new file mode 100644
index 000000000..e4731e280
--- /dev/null
+++ b/res/drawable-xhdpi/ic_refocus_on_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_disabled.png b/res/drawable-xhdpi/ic_settings_disabled.png
new file mode 100644
index 000000000..e95c26fe9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_normal.png b/res/drawable-xhdpi/ic_settings_normal.png
index 5c531bb85..27a292d0c 100644
--- a/res/drawable-xhdpi/ic_settings_normal.png
+++ b/res/drawable-xhdpi/ic_settings_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_stop_disabled.png b/res/drawable-xhdpi/ic_stop_disabled.png
new file mode 100644
index 000000000..70717b0e5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_stop_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_stop_normal.png b/res/drawable-xhdpi/ic_stop_normal.png
new file mode 100644
index 000000000..f76a6ec25
--- /dev/null
+++ b/res/drawable-xhdpi/ic_stop_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera_back_disabled.png b/res/drawable-xhdpi/ic_switch_camera_back_disabled.png
new file mode 100644
index 000000000..8f7f1923d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_switch_camera_back_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera_back_normal.png b/res/drawable-xhdpi/ic_switch_camera_back_normal.png
new file mode 100644
index 000000000..4970deb95
--- /dev/null
+++ b/res/drawable-xhdpi/ic_switch_camera_back_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera_front_disabled.png b/res/drawable-xhdpi/ic_switch_camera_front_disabled.png
new file mode 100644
index 000000000..d7ef441b7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_switch_camera_front_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_camera_front_normal.png b/res/drawable-xhdpi/ic_switch_camera_front_normal.png
new file mode 100644
index 000000000..7ee10978b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_switch_camera_front_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timelapse_disabled.png b/res/drawable-xhdpi/ic_timelapse_disabled.png
new file mode 100644
index 000000000..5fc4ad726
--- /dev/null
+++ b/res/drawable-xhdpi/ic_timelapse_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_video_disabled.png b/res/drawable-xhdpi/ic_video_disabled.png
new file mode 100644
index 000000000..70fe0fc8c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_video_disabled.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wide_angle_disabled.png b/res/drawable-xhdpi/ic_wide_angle_disabled.png
new file mode 100644
index 000000000..3623f2eca
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wide_angle_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/bg_options_indicator.9.png b/res/drawable-xxhdpi/bg_options_indicator.9.png
new file mode 100644
index 000000000..d2bf7c31f
--- /dev/null
+++ b/res/drawable-xxhdpi/bg_options_indicator.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_auto_focus_disabled.png b/res/drawable-xxhdpi/ic_auto_focus_disabled.png
new file mode 100644
index 000000000..6049d7889
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_auto_focus_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_auto_focus_normal.png b/res/drawable-xxhdpi/ic_auto_focus_normal.png
new file mode 100644
index 000000000..6888aa472
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_auto_focus_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_disabled.png b/res/drawable-xxhdpi/ic_back_disabled.png
new file mode 100644
index 000000000..82f94955f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_back_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_back_normal.png b/res/drawable-xxhdpi/ic_back_normal.png
new file mode 100644
index 000000000..5abb8a6f4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_back_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_camera_disabled.png b/res/drawable-xxhdpi/ic_camera_disabled.png
new file mode 100644
index 000000000..9165d50af
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_camera_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cancel_disabled.png b/res/drawable-xxhdpi/ic_cancel_disabled.png
new file mode 100644
index 000000000..3bdbf2f72
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cancel_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_cancel_normal.png b/res/drawable-xxhdpi/ic_cancel_normal.png
new file mode 100644
index 000000000..8b018da49
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_cancel_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_capture_options.png b/res/drawable-xxhdpi/ic_capture_options.png
new file mode 100644
index 000000000..e559a02c1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_capture_options.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_confirm_disabled.png b/res/drawable-xxhdpi/ic_confirm_disabled.png
new file mode 100644
index 000000000..e6cae84a8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_confirm_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_confirm_normal.png b/res/drawable-xxhdpi/ic_confirm_normal.png
new file mode 100644
index 000000000..d0b3615e9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_confirm_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_craft_disabled.png b/res/drawable-xxhdpi/ic_craft_disabled.png
new file mode 100644
index 000000000..3ac3bf58a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_craft_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_auto_disabled.png b/res/drawable-xxhdpi/ic_flash_auto_disabled.png
new file mode 100644
index 000000000..aec5d088f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_auto_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_auto_indicator.png b/res/drawable-xxhdpi/ic_flash_auto_indicator.png
new file mode 100644
index 000000000..ec512a8ee
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_auto_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_auto_normal.png b/res/drawable-xxhdpi/ic_flash_auto_normal.png
new file mode 100644
index 000000000..48bdba36f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_auto_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_off_disabled.png b/res/drawable-xxhdpi/ic_flash_off_disabled.png
new file mode 100644
index 000000000..a4d070b11
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_off_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_off_indicator.png b/res/drawable-xxhdpi/ic_flash_off_indicator.png
new file mode 100644
index 000000000..1cde92f7b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_off_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_off_normal.png b/res/drawable-xxhdpi/ic_flash_off_normal.png
new file mode 100644
index 000000000..33a372c7c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_off_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_on_disabled.png b/res/drawable-xxhdpi/ic_flash_on_disabled.png
new file mode 100644
index 000000000..7db39d5a0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_on_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_on_indicator.png b/res/drawable-xxhdpi/ic_flash_on_indicator.png
new file mode 100644
index 000000000..47b39179b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_on_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_flash_on_normal.png b/res/drawable-xxhdpi/ic_flash_on_normal.png
new file mode 100644
index 000000000..660ff6062
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_flash_on_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png
new file mode 100644
index 000000000..0ad52ddb0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png b/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
new file mode 100644
index 000000000..08369e139
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png
new file mode 100644
index 000000000..8103f8bf1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png
new file mode 100644
index 000000000..37ce48189
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png b/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
new file mode 100644
index 000000000..7b6e15803
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png
new file mode 100644
index 000000000..6fb726c79
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_manual_focus_disabled.png b/res/drawable-xxhdpi/ic_manual_focus_disabled.png
new file mode 100644
index 000000000..3577021f7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_manual_focus_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_manual_focus_normal.png b/res/drawable-xxhdpi/ic_manual_focus_normal.png
new file mode 100644
index 000000000..4d83085ca
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_manual_focus_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_panorama_disabled.png b/res/drawable-xxhdpi/ic_panorama_disabled.png
new file mode 100644
index 000000000..b0646880b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_panorama_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_photo_sphere_disabled.png b/res/drawable-xxhdpi/ic_photo_sphere_disabled.png
new file mode 100644
index 000000000..11e2b44e4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_photo_sphere_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_play_disabled.png b/res/drawable-xxhdpi/ic_play_disabled.png
new file mode 100644
index 000000000..5ed78c735
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_play_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_play_normal.png b/res/drawable-xxhdpi/ic_play_normal.png
new file mode 100644
index 000000000..65b2b1922
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_play_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_disabled.png b/res/drawable-xxhdpi/ic_refocus_disabled.png
new file mode 100644
index 000000000..333821809
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_normal.png b/res/drawable-xxhdpi/ic_refocus_normal.png
new file mode 100644
index 000000000..369c10a84
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_off.png b/res/drawable-xxhdpi/ic_refocus_off.png
new file mode 100644
index 000000000..481860253
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_off.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_off_disabled.png b/res/drawable-xxhdpi/ic_refocus_off_disabled.png
new file mode 100644
index 000000000..135ed3552
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_off_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_off_indicator.png b/res/drawable-xxhdpi/ic_refocus_off_indicator.png
new file mode 100644
index 000000000..ca0c28637
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_off_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_off_normal.png b/res/drawable-xxhdpi/ic_refocus_off_normal.png
new file mode 100644
index 000000000..6da6b4675
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_off_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_refocus_on_indicator.png b/res/drawable-xxhdpi/ic_refocus_on_indicator.png
new file mode 100644
index 000000000..86ceb9f1b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_refocus_on_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_disabled.png b/res/drawable-xxhdpi/ic_settings_disabled.png
new file mode 100644
index 000000000..65404c9c5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_normal.png b/res/drawable-xxhdpi/ic_settings_normal.png
index 1ff448531..6f005e6dd 100644
--- a/res/drawable-xxhdpi/ic_settings_normal.png
+++ b/res/drawable-xxhdpi/ic_settings_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_stop_disabled.png b/res/drawable-xxhdpi/ic_stop_disabled.png
new file mode 100644
index 000000000..c97ffe02e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_stop_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_stop_normal.png b/res/drawable-xxhdpi/ic_stop_normal.png
new file mode 100644
index 000000000..1462bfd6b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_stop_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png b/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png
new file mode 100644
index 000000000..5a91f9cff
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_normal.png b/res/drawable-xxhdpi/ic_switch_camera_back_normal.png
new file mode 100644
index 000000000..ee4f2e284
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_camera_back_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png b/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png
new file mode 100644
index 000000000..1ec9f173f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_normal.png b/res/drawable-xxhdpi/ic_switch_camera_front_normal.png
new file mode 100644
index 000000000..d35b9547b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_switch_camera_front_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_timelapse_disabled.png b/res/drawable-xxhdpi/ic_timelapse_disabled.png
new file mode 100644
index 000000000..045bd46be
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_timelapse_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_video_disabled.png b/res/drawable-xxhdpi/ic_video_disabled.png
new file mode 100644
index 000000000..f1576324e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_video_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wide_angle_disabled.png b/res/drawable-xxhdpi/ic_wide_angle_disabled.png
new file mode 100644
index 000000000..58b95907e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wide_angle_disabled.png
Binary files differ
diff --git a/res/drawable/ic_auto_focus.xml b/res/drawable/ic_auto_focus.xml
new file mode 100644
index 000000000..cf9d061df
--- /dev/null
+++ b/res/drawable/ic_auto_focus.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_auto_focus_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_auto_focus_normal" />
+</selector>
diff --git a/res/drawable/ic_back.xml b/res/drawable/ic_back.xml
new file mode 100644
index 000000000..9ab4b34b7
--- /dev/null
+++ b/res/drawable/ic_back.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_back_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_back_normal" />
+</selector>
diff --git a/res/drawable/ic_camera.xml b/res/drawable/ic_camera.xml
new file mode 100644
index 000000000..31fd1eeb0
--- /dev/null
+++ b/res/drawable/ic_camera.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_camera_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_camera_normal" />
+</selector>
diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml
new file mode 100644
index 000000000..786d81148
--- /dev/null
+++ b/res/drawable/ic_cancel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_cancel_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_cancel_normal" />
+</selector>
diff --git a/res/drawable/ic_confirm.xml b/res/drawable/ic_confirm.xml
new file mode 100644
index 000000000..b8a317083
--- /dev/null
+++ b/res/drawable/ic_confirm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_confirm_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_confirm_normal" />
+</selector>
diff --git a/res/drawable/ic_craft.xml b/res/drawable/ic_craft.xml
new file mode 100644
index 000000000..b0c56d39a
--- /dev/null
+++ b/res/drawable/ic_craft.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_craft_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_craft_normal" />
+</selector>
diff --git a/res/drawable/ic_flash_auto.xml b/res/drawable/ic_flash_auto.xml
new file mode 100644
index 000000000..aa3158c55
--- /dev/null
+++ b/res/drawable/ic_flash_auto.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_flash_auto_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_flash_auto_normal" />
+</selector>
diff --git a/res/drawable/ic_flash_off.xml b/res/drawable/ic_flash_off.xml
new file mode 100644
index 000000000..195ce401a
--- /dev/null
+++ b/res/drawable/ic_flash_off.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_flash_off_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_flash_off_normal" />
+</selector>
diff --git a/res/drawable/ic_flash_on.xml b/res/drawable/ic_flash_on.xml
new file mode 100644
index 000000000..e54db2bd7
--- /dev/null
+++ b/res/drawable/ic_flash_on.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_flash_on_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_flash_on_normal" />
+</selector>
diff --git a/res/drawable/ic_hdr_plus_off.xml b/res/drawable/ic_hdr_plus_off.xml
new file mode 100644
index 000000000..00bd6e7d9
--- /dev/null
+++ b/res/drawable/ic_hdr_plus_off.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_hdr_plus_off_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_hdr_plus_off_normal" />
+</selector>
diff --git a/res/drawable/ic_hdr_plus_on.xml b/res/drawable/ic_hdr_plus_on.xml
new file mode 100644
index 000000000..d61fdb7fc
--- /dev/null
+++ b/res/drawable/ic_hdr_plus_on.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_hdr_plus_on_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_hdr_plus_on_normal" />
+</selector>
diff --git a/res/drawable/ic_manual_focus.xml b/res/drawable/ic_manual_focus.xml
new file mode 100644
index 000000000..9caea228a
--- /dev/null
+++ b/res/drawable/ic_manual_focus.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_manual_focus_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_manual_focus_normal" />
+</selector>
diff --git a/res/drawable/ic_panorama.xml b/res/drawable/ic_panorama.xml
new file mode 100644
index 000000000..a474c99c6
--- /dev/null
+++ b/res/drawable/ic_panorama.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_panorama_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_panorama_normal" />
+</selector>
diff --git a/res/drawable/ic_photo_sphere.xml b/res/drawable/ic_photo_sphere.xml
new file mode 100644
index 000000000..6a64b3832
--- /dev/null
+++ b/res/drawable/ic_photo_sphere.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_photo_sphere_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_photo_sphere_normal" />
+</selector>
diff --git a/res/drawable/ic_play.xml b/res/drawable/ic_play.xml
new file mode 100644
index 000000000..bde467c06
--- /dev/null
+++ b/res/drawable/ic_play.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_play_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_play_normal" />
+</selector>
diff --git a/res/drawable/ic_refocus.xml b/res/drawable/ic_refocus.xml
new file mode 100644
index 000000000..754540ab6
--- /dev/null
+++ b/res/drawable/ic_refocus.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_refocus_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_refocus_normal" />
+</selector>
diff --git a/res/drawable/ic_refocus_off.xml b/res/drawable/ic_refocus_off.xml
new file mode 100644
index 000000000..d3f57efe2
--- /dev/null
+++ b/res/drawable/ic_refocus_off.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_refocus_off_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_refocus_off_normal" />
+</selector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..1c5ebf7d1
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_settings_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_settings_normal" />
+</selector>
diff --git a/res/drawable/ic_stop.xml b/res/drawable/ic_stop.xml
new file mode 100644
index 000000000..7ad43b939
--- /dev/null
+++ b/res/drawable/ic_stop.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_stop_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_stop_normal" />
+</selector>
diff --git a/res/drawable/ic_switch_camera_back.xml b/res/drawable/ic_switch_camera_back.xml
new file mode 100644
index 000000000..3eff3ae7c
--- /dev/null
+++ b/res/drawable/ic_switch_camera_back.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_switch_camera_back_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_switch_camera_back_normal" />
+</selector>
diff --git a/res/drawable/ic_switch_camera_front.xml b/res/drawable/ic_switch_camera_front.xml
new file mode 100644
index 000000000..2f836bb02
--- /dev/null
+++ b/res/drawable/ic_switch_camera_front.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_switch_camera_front_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_switch_camera_front_normal" />
+</selector>
diff --git a/res/drawable/ic_timelapse.xml b/res/drawable/ic_timelapse.xml
new file mode 100644
index 000000000..69dfb40c9
--- /dev/null
+++ b/res/drawable/ic_timelapse.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_timelapse_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_timelapse_normal" />
+</selector>
diff --git a/res/drawable/ic_video.xml b/res/drawable/ic_video.xml
new file mode 100644
index 000000000..7d4899e9f
--- /dev/null
+++ b/res/drawable/ic_video.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_video_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_video_normal" />
+</selector>
diff --git a/res/drawable/ic_wide_angle.xml b/res/drawable/ic_wide_angle.xml
new file mode 100644
index 000000000..ab5ea1c45
--- /dev/null
+++ b/res/drawable/ic_wide_angle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_wide_angle_disabled"
+ android:state_enabled="false" />
+ <item android:drawable="@drawable/ic_wide_angle_normal" />
+</selector>
diff --git a/res/layout/photo_intent_bottombar_buttons.xml b/res/layout/photo_intent_bottombar_buttons.xml
index 928f7573a..c3ace9a54 100644
--- a/res/layout/photo_intent_bottombar_buttons.xml
+++ b/res/layout/photo_intent_bottombar_buttons.xml
@@ -22,7 +22,7 @@
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_cancel_holo_light"
+ android:src="@drawable/ic_cancel"
android:background="@null" />
<!-- dummy invisible view only for spacing -->
<View
diff --git a/res/layout/photo_intent_review_bottombar_buttons.xml b/res/layout/photo_intent_review_bottombar_buttons.xml
index 1ac7d0622..6b02f74bb 100644
--- a/res/layout/photo_intent_review_bottombar_buttons.xml
+++ b/res/layout/photo_intent_review_bottombar_buttons.xml
@@ -22,18 +22,18 @@
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_cancel_holo_light"
+ android:src="@drawable/ic_cancel"
android:background="@null" />
<ImageButton
android:id="@+id/done_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_done_holo_light"
+ android:src="@drawable/ic_confirm"
android:background="@null" />
<ImageButton
android:id="@+id/retake_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_trash_holo_light"
+ android:src="@drawable/ic_back"
android:background="@null" />
</merge> \ No newline at end of file
diff --git a/res/layout/video_intent_bottombar_buttons.xml b/res/layout/video_intent_bottombar_buttons.xml
index 200f146f0..c3583eaaa 100644
--- a/res/layout/video_intent_bottombar_buttons.xml
+++ b/res/layout/video_intent_bottombar_buttons.xml
@@ -22,7 +22,7 @@
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_cancel_holo_light"
+ android:src="@drawable/ic_cancel"
android:background="@null" />
<!-- dummy invisible view only for spacing -->
<View
diff --git a/res/layout/video_intent_review_bottombar_buttons.xml b/res/layout/video_intent_review_bottombar_buttons.xml
index a58e9f2ca..efb7ea75e 100644
--- a/res/layout/video_intent_review_bottombar_buttons.xml
+++ b/res/layout/video_intent_review_bottombar_buttons.xml
@@ -22,18 +22,18 @@
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_cancel_holo_light"
+ android:src="@drawable/ic_cancel"
android:background="@null" />
<ImageButton
android:id="@+id/done_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_done_holo_light"
+ android:src="@drawable/ic_confirm"
android:background="@null" />
<ImageButton
android:id="@+id/review_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_trash_holo_light"
+ android:src="@drawable/ic_play"
android:background="@null" />
</merge> \ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher_camera_dogfood.png b/res/mipmap-hdpi/ic_launcher_camera_dogfood.png
new file mode 100644
index 000000000..40bdceb66
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_camera_dogfood.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_camera_fishfood.png b/res/mipmap-hdpi/ic_launcher_camera_fishfood.png
new file mode 100644
index 000000000..74af67d87
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_camera_fishfood.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_camera_dogfood.png b/res/mipmap-mdpi/ic_launcher_camera_dogfood.png
new file mode 100644
index 000000000..4a6cb06a1
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_camera_dogfood.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_camera_fishfood.png b/res/mipmap-mdpi/ic_launcher_camera_fishfood.png
new file mode 100644
index 000000000..77813f490
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_camera_fishfood.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_camera_dogfood.png b/res/mipmap-xhdpi/ic_launcher_camera_dogfood.png
new file mode 100644
index 000000000..023043c29
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_camera_dogfood.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_camera_fishfood.png b/res/mipmap-xhdpi/ic_launcher_camera_fishfood.png
new file mode 100644
index 000000000..529ddcdc5
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_camera_fishfood.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_camera_dogfood.png b/res/mipmap-xxhdpi/ic_launcher_camera_dogfood.png
new file mode 100644
index 000000000..ef89814d0
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_camera_dogfood.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_camera_fishfood.png b/res/mipmap-xxhdpi/ic_launcher_camera_fishfood.png
new file mode 100644
index 000000000..b4a60e1be
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_camera_fishfood.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_camera_dogfood.png b/res/mipmap-xxxhdpi/ic_launcher_camera_dogfood.png
new file mode 100644
index 000000000..120bf6c52
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_camera_dogfood.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_camera_fishfood.png b/res/mipmap-xxxhdpi/ic_launcher_camera_fishfood.png
new file mode 100644
index 000000000..c4a693fe9
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_camera_fishfood.png
Binary files differ
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0da189876..b33d4d340 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -239,15 +239,15 @@
</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>
</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>
</array>
<!-- Videocamera Preferences flash mode dialog box entries -->
@@ -267,13 +267,13 @@
</string-array>
<array name="video_flashmode_icons" translatable="false">
- <item>@drawable/ic_flash_on_holo_light</item>
- <item>@drawable/ic_flash_off_holo_light</item>
+ <item>@drawable/ic_flash_on</item>
+ <item>@drawable/ic_flash_off</item>
</array>
<array name="video_flashmode_largeicons" translatable="false">
- <item>@drawable/ic_flash_on_holo_light</item>
- <item>@drawable/ic_flash_off_holo_light</item>
+ <item>@drawable/ic_flash_on</item>
+ <item>@drawable/ic_flash_off</item>
</array>
<string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
@@ -394,13 +394,13 @@
</array>
<array name="camera_id_icons" translatable="false">
- <item>@drawable/ic_switch_back</item>
- <item>@drawable/ic_switch_front</item>
+ <item>@drawable/ic_switch_camera_back</item>
+ <item>@drawable/ic_switch_camera_front</item>
</array>
<array name="camera_id_largeicons" translatable="false">
- <item>@drawable/ic_switch_back</item>
- <item>@drawable/ic_switch_front</item>
+ <item>@drawable/ic_switch_camera_back</item>
+ <item>@drawable/ic_switch_camera_front</item>
</array>
<string-array name="pref_video_effect_entries" translatable="false">
@@ -453,8 +453,8 @@
</string-array>
<string-array name="pref_camera_hdr_plus_icons" translatable="false">
- <item>@drawable/ic_hdr_plus_disabled</item>
- <item>@drawable/ic_hdr_plus_normal</item>
+ <item>@drawable/ic_hdr_plus_off</item>
+ <item>@drawable/ic_hdr_plus_on</item>
</string-array>
<string-array name="pref_camera_hdr_plus_entryvalues" translatable="false">
@@ -472,7 +472,6 @@
<item>@string/pref_camera_scenemode_entry_turn_hdr_on</item>
<item>@string/pref_camera_scenemode_entry_turn_hdr_off</item>
</string-array>
-
<string-array name="pref_camera_hdr_icons" translatable="false">
<item>@drawable/ic_hdr_off</item>
<item>@drawable/ic_hdr</item>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
deleted file mode 100644
index 975a15dea..000000000
--- a/res/xml/camera_preferences.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
- camera:title="@string/pref_camera_settings_category">
- <IconListPreference
- camera:key="pref_camera_flashmode_key"
- camera:defaultValue="@string/pref_camera_flashmode_default"
- camera:title="@string/pref_camera_flashmode_title"
- camera:icons="@array/camera_flashmode_icons"
- camera:largeIcons="@array/camera_flashmode_largeicons"
- camera:entries="@array/pref_camera_flashmode_entries"
- camera:entryValues="@array/pref_camera_flashmode_entryvalues"
- camera:labelList="@array/pref_camera_flashmode_labels" />
- <IconListPreference
- 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" />
- <IconListPreference
- camera:key="pref_camera_scenemode_key"
- camera:defaultValue="@string/pref_camera_scenemode_default"
- camera:title="@string/pref_camera_scenemode_title"
- camera:singleIcon="@drawable/ic_sce"
- camera:entries="@array/pref_camera_scenemode_entries"
- camera:labelList="@array/pref_camera_scenemode_labels"
- camera:icons="@array/pref_camera_scenemode_icons"
- camera:largeIcons="@array/pref_camera_scenemode_icons"
- camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
- <IconListPreference
- camera:key="pref_camera_whitebalance_key"
- camera:defaultValue="@string/pref_camera_whitebalance_default"
- camera:title="@string/pref_camera_whitebalance_title"
- camera:icons="@array/whitebalance_icons"
- camera:largeIcons="@array/whitebalance_largeicons"
- camera:entries="@array/pref_camera_whitebalance_entries"
- camera:entryValues="@array/pref_camera_whitebalance_entryvalues"
- camera:labelList="@array/pref_camera_whitebalance_labels" />
- <RecordLocationPreference
- camera:key="pref_camera_recordlocation_key"
- camera:defaultValue="@string/pref_camera_recordlocation_default"
- camera:title="@string/pref_camera_recordlocation_title"
- camera:icons="@array/camera_recordlocation_icons"
- camera:largeIcons="@array/camera_recordlocation_largeicons"
- camera:entries="@array/pref_camera_recordlocation_entries"
- camera:labelList="@array/pref_camera_recordlocation_labels"
- camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
- <ListPreference
- camera:key="pref_camera_picturesize_key"
- camera:title="@string/pref_camera_picturesize_title"
- camera:entries="@array/pref_camera_picturesize_entries"
- camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
- <ListPreference
- camera:key="pref_camera_focusmode_key"
- camera:defaultValue="@array/pref_camera_focusmode_default_array"
- camera:title="@string/pref_camera_focusmode_title"
- camera:entries="@array/pref_camera_focusmode_entries"
- camera:labelList="@array/pref_camera_focusmode_labels"
- camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
- <IconListPreference
- camera:key="pref_camera_id_key"
- camera:defaultValue="@string/pref_camera_id_default"
- camera:title="@string/pref_camera_id_title"
- camera:icons="@array/camera_id_icons"
- camera:entries="@array/camera_id_entries"
- camera:labelList="@array/camera_id_labels"
- camera:largeIcons="@array/camera_id_largeicons" />
- <IconListPreference
- camera:key="pref_camera_hdr_key"
- camera:defaultValue="@string/pref_camera_hdr_default"
- camera:title="@string/pref_camera_scenemode_entry_hdr"
- camera:entries="@array/pref_camera_hdr_entries"
- camera:icons="@array/pref_camera_hdr_icons"
- camera:largeIcons="@array/pref_camera_hdr_icons"
- camera:labelList="@array/pref_camera_hdr_labels"
- camera:entryValues="@array/pref_camera_hdr_entryvalues" />
- <IconListPreference
- camera:key="pref_camera_hdr_plus_key"
- camera:defaultValue="@string/pref_camera_hdr_plus_default"
- camera:title="@string/pref_camera_scenemode_entry_hdr_plus"
- camera:entries="@array/pref_camera_hdr_plus_entries"
- camera:icons="@array/pref_camera_hdr_plus_icons"
- camera:largeIcons="@array/pref_camera_hdr_plus_icons"
- camera:labelList="@array/pref_camera_hdr_plus_labels"
- camera:entryValues="@array/pref_camera_hdr_plus_entryvalues" />
- <CountDownTimerPreference
- camera:key="pref_camera_timer_key"
- camera:defaultValue="@string/pref_camera_timer_default"
- camera:title="@string/pref_camera_timer_title" />
- <ListPreference
- camera:key="pref_camera_timer_sound_key"
- camera:defaultValue="@string/pref_camera_timer_sound_default"
- camera:title="@string/pref_camera_timer_sound_title"
- camera:entries="@array/pref_camera_timer_sound_entries"
- camera:entryValues="@array/pref_camera_timer_sound_entryvalues" />
-</PreferenceGroup>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
deleted file mode 100644
index ce36219f8..000000000
--- a/res/xml/video_preferences.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<PreferenceGroup
- xmlns:camera="http://schemas.android.com/apk/res/com.android.camera2"
- camera:title="@string/pref_camcorder_settings_category">
- <ListPreference
- camera:key="pref_video_quality_key"
- camera:title="@string/pref_video_quality_title"
- camera:entries="@array/pref_video_quality_entries"
- camera:entryValues="@array/pref_video_quality_entryvalues"/>
- <IconListPreference
- camera:key="pref_video_time_lapse_frame_interval_key"
- camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
- camera:title="@string/pref_video_time_lapse_frame_interval_title"
- camera:singleIcon="@drawable/ic_timelapse_none"
- camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
- camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_video_flashmode_key"
- camera:defaultValue="@string/pref_camera_video_flashmode_default"
- camera:title="@string/pref_camera_flashmode_title"
- camera:icons="@array/video_flashmode_icons"
- camera:largeIcons="@array/video_flashmode_largeicons"
- camera:entries="@array/pref_camera_video_flashmode_entries"
- camera:labelList="@array/pref_camera_video_flashmode_labels"
- camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_whitebalance_key"
- camera:defaultValue="@string/pref_camera_whitebalance_default"
- camera:title="@string/pref_camera_whitebalance_title"
- camera:icons="@array/whitebalance_icons"
- camera:largeIcons="@array/whitebalance_largeicons"
- camera:entries="@array/pref_camera_whitebalance_entries"
- camera:labelList="@array/pref_camera_whitebalance_labels"
- camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
- <IconListPreference
- camera:key="pref_camera_id_key"
- camera:defaultValue="@string/pref_camera_id_default"
- camera:title="@string/pref_camera_id_title"
- camera:icons="@array/camera_id_icons"
- camera:entries="@array/camera_id_entries"
- camera:labelList="@array/camera_id_labels"
- camera:largeIcons="@array/camera_id_largeicons"/>
- <IconListPreference
- camera:key="pref_video_effect_key"
- camera:defaultValue="@string/pref_video_effect_default"
- camera:title="@string/pref_video_effect_title"
- camera:icons="@array/video_effect_icons"
- camera:largeIcons="@array/video_effect_icons"
- camera:entries="@array/pref_video_effect_entries"
- camera:entryValues="@array/pref_video_effect_entryvalues" />
- <RecordLocationPreference
- camera:key="pref_camera_recordlocation_key"
- camera:defaultValue="@string/pref_camera_recordlocation_default"
- camera:title="@string/pref_camera_recordlocation_title"
- camera:icons="@array/camera_recordlocation_icons"
- camera:largeIcons="@array/camera_recordlocation_largeicons"
- camera:entries="@array/pref_camera_recordlocation_entries"
- camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
-</PreferenceGroup>
diff --git a/src/com/android/camera/ButtonManager.java b/src/com/android/camera/ButtonManager.java
index 6406e3408..c3423ff60 100644
--- a/src/com/android/camera/ButtonManager.java
+++ b/src/com/android/camera/ButtonManager.java
@@ -133,7 +133,7 @@ public class ButtonManager {
public void enablePushButton(int buttonId, int resId, View.OnClickListener cb) {
ImageButton button = getImageButtonOrError(buttonId, resId);
button.setOnClickListener(cb);
- button.setVisibility(View.VISIBLE);
+ button.setEnabled(true);
}
/**
@@ -141,7 +141,7 @@ public class ButtonManager {
*/
public void disableButton(int buttonId, int resId) {
MultiToggleImageButton button = getButtonOrError(buttonId, resId);
- button.setVisibility(View.INVISIBLE);
+ button.setEnabled(false);
}
/**
diff --git a/src/com/android/camera/ui/ModeListView.java b/src/com/android/camera/ui/ModeListView.java
index 1833fb9e4..718d51002 100644
--- a/src/com/android/camera/ui/ModeListView.java
+++ b/src/com/android/camera/ui/ModeListView.java
@@ -108,20 +108,20 @@ public class ModeListView extends ScrollView {
private static final Mode[] mModes;
static {
mModes = new Mode[MODE_TOTAL];
- mModes[MODE_PHOTO] = new Mode(R.drawable.ic_camera_normal, R.string.mode_camera,
+ mModes[MODE_PHOTO] = new Mode(R.drawable.ic_camera, R.string.mode_camera,
R.color.camera_mode_color);
- mModes[MODE_VIDEO] = new Mode(R.drawable.ic_video_normal, R.string.mode_video,
+ mModes[MODE_VIDEO] = new Mode(R.drawable.ic_video, R.string.mode_video,
R.color.video_mode_color);
- mModes[MODE_PHOTOSPHERE] = new Mode(R.drawable.ic_photo_sphere_normal,
+ mModes[MODE_PHOTOSPHERE] = new Mode(R.drawable.ic_photo_sphere,
R.string.mode_photosphere,
R.color.photosphere_mode_color);
- mModes[MODE_CRAFT] = new Mode(R.drawable.ic_camera_normal, R.string.mode_advanced_camera,
+ mModes[MODE_CRAFT] = new Mode(R.drawable.ic_craft, R.string.mode_advanced_camera,
R.color.craft_mode_color);
- mModes[MODE_TIMELAPSE] = new Mode(R.drawable.ic_timelapse_normal, R.string.mode_timelapse,
+ mModes[MODE_TIMELAPSE] = new Mode(R.drawable.ic_timelapse, R.string.mode_timelapse,
R.color.timelapse_mode_color);
- mModes[MODE_WIDEANGLE] = new Mode(R.drawable.ic_panorama_normal, R.string.mode_panorama,
+ mModes[MODE_WIDEANGLE] = new Mode(R.drawable.ic_panorama, R.string.mode_panorama,
R.color.panorama_mode_color);
- mModes[MODE_SETTING] = new Mode(R.drawable.ic_settings_normal, R.string.mode_settings,
+ mModes[MODE_SETTING] = new Mode(R.drawable.ic_settings, R.string.mode_settings,
R.color.settings_mode_color);
}