diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:19:02 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:19:02 +0000 |
| commit | 89e053367650ef9baecbf83e4b4008b4f2574633 (patch) | |
| tree | f95c8e11c87026311b7d8d0f78acf11665a91af6 | |
| parent | f3a8debc17957957d48f4232054c525df0d7fda3 (diff) | |
| parent | c4f3de3d4009f35b4f6e9c0dda3710f84fe2b79c (diff) | |
| download | Camera2-89e053367650ef9baecbf83e4b4008b4f2574633.tar.gz | |
Snap for 10453563 from c4f3de3d4009f35b4f6e9c0dda3710f84fe2b79c to mainline-sdkext-releaseaml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010
Change-Id: Iae7235edd4033bcff5c17072b3f0928cd2ffa494
374 files changed, 160 insertions, 311 deletions
diff --git a/Android.bp b/Android.bp index a3cad5888..5cf37d569 100644 --- a/Android.bp +++ b/Android.bp @@ -44,7 +44,7 @@ android_app { "20002000", ], - sdk_version: "current", + sdk_version: "system_current", product_specific: true, diff --git a/res/drawable-hdpi-v19/btn_shutter_recording.png b/res/drawable-hdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index f17ce46e6..000000000 --- a/res/drawable-hdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-hdpi-v19/btn_shutter_video_default.png b/res/drawable-hdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 63a53e234..000000000 --- a/res/drawable-hdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-hdpi-v19/btn_shutter_video_pressed.png b/res/drawable-hdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 1f7dca293..000000000 --- a/res/drawable-hdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-hdpi-v19/btn_shutter_video_recording.png b/res/drawable-hdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 5ee92ae9c..000000000 --- a/res/drawable-hdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-hdpi/background_portrait.jpg b/res/drawable-hdpi/background_portrait.jpg Binary files differdeleted file mode 100644 index 75309b486..000000000 --- a/res/drawable-hdpi/background_portrait.jpg +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_default_disabled.png b/res/drawable-hdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index a50a4ad00..000000000 --- a/res/drawable-hdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_pressed_disabled.png b/res/drawable-hdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 5dc7d9de8..000000000 --- a/res/drawable-hdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_recording.png b/res/drawable-hdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 4a2e45223..000000000 --- a/res/drawable-hdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_video_default.png b/res/drawable-hdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 1fe24f2b0..000000000 --- a/res/drawable-hdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_video_pressed.png b/res/drawable-hdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 78f4b1660..000000000 --- a/res/drawable-hdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_shutter_video_recording.png b/res/drawable-hdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index e9921d02c..000000000 --- a/res/drawable-hdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-hdpi/camera_crop.png b/res/drawable-hdpi/camera_crop.png Binary files differdeleted file mode 100644 index 97b1b989e..000000000 --- a/res/drawable-hdpi/camera_crop.png +++ /dev/null diff --git a/res/drawable-hdpi/focus_ring_touch_inner.png b/res/drawable-hdpi/focus_ring_touch_inner.png Binary files differdeleted file mode 100644 index 7398508d6..000000000 --- a/res/drawable-hdpi/focus_ring_touch_inner.png +++ /dev/null diff --git a/res/drawable-hdpi/focus_ring_touch_outer.png b/res/drawable-hdpi/focus_ring_touch_outer.png Binary files differdeleted file mode 100644 index 2ba63c9c1..000000000 --- a/res/drawable-hdpi/focus_ring_touch_outer.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_done_disabled.png b/res/drawable-hdpi/ic_done_disabled.png Binary files differdeleted file mode 100644 index d074f90ab..000000000 --- a/res/drawable-hdpi/ic_done_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_done_normal.png b/res/drawable-hdpi/ic_done_normal.png Binary files differdeleted file mode 100644 index 521a8ca47..000000000 --- a/res/drawable-hdpi/ic_done_normal.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_0_disabled.png b/res/drawable-hdpi/ic_exposure_0_disabled.png Binary files differdeleted file mode 100644 index 5315aec84..000000000 --- a/res/drawable-hdpi/ic_exposure_0_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_0_indicator.png b/res/drawable-hdpi/ic_exposure_0_indicator.png Binary files differdeleted file mode 100644 index bbf0d32f9..000000000 --- a/res/drawable-hdpi/ic_exposure_0_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_holo_light.png b/res/drawable-hdpi/ic_exposure_holo_light.png Binary files differdeleted file mode 100644 index 39662a4b5..000000000 --- a/res/drawable-hdpi/ic_exposure_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_indicator.png b/res/drawable-hdpi/ic_exposure_indicator.png Binary files differdeleted file mode 100644 index 4445049e3..000000000 --- a/res/drawable-hdpi/ic_exposure_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_n1_disabled.png b/res/drawable-hdpi/ic_exposure_n1_disabled.png Binary files differdeleted file mode 100644 index 29d2cb532..000000000 --- a/res/drawable-hdpi/ic_exposure_n1_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_n2_disabled.png b/res/drawable-hdpi/ic_exposure_n2_disabled.png Binary files differdeleted file mode 100644 index 86e071e1c..000000000 --- a/res/drawable-hdpi/ic_exposure_n2_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_p1_disabled.png b/res/drawable-hdpi/ic_exposure_p1_disabled.png Binary files differdeleted file mode 100644 index 2612043d4..000000000 --- a/res/drawable-hdpi/ic_exposure_p1_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_exposure_p2_disabled.png b/res/drawable-hdpi/ic_exposure_p2_disabled.png Binary files differdeleted file mode 100644 index 715cfa9f2..000000000 --- a/res/drawable-hdpi/ic_exposure_p2_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light.png b/res/drawable-hdpi/ic_flash_auto_holo_light.png Binary files differdeleted file mode 100644 index a34d63a0c..000000000 --- a/res/drawable-hdpi/ic_flash_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_flash_off_holo_light.png b/res/drawable-hdpi/ic_flash_off_holo_light.png Binary files differdeleted file mode 100644 index 3fe45fc80..000000000 --- a/res/drawable-hdpi/ic_flash_off_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_flash_on_holo_light.png b/res/drawable-hdpi/ic_flash_on_holo_light.png Binary files differdeleted file mode 100644 index 2d67e4530..000000000 --- a/res/drawable-hdpi/ic_flash_on_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_hdr_plus_disabled.png b/res/drawable-hdpi/ic_hdr_plus_disabled.png Binary files differdeleted file mode 100644 index f7401d9e5..000000000 --- a/res/drawable-hdpi/ic_hdr_plus_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png Binary files differdeleted file mode 100644 index fd111e160..000000000 --- a/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_hdr_plus_normal.png b/res/drawable-hdpi/ic_hdr_plus_normal.png Binary files differdeleted file mode 100644 index f08e307c4..000000000 --- a/res/drawable-hdpi/ic_hdr_plus_normal.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png Binary files differdeleted file mode 100644 index aa8cd9215..000000000 --- a/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_imagesize.png b/res/drawable-hdpi/ic_imagesize.png Binary files differdeleted file mode 100644 index 126208b44..000000000 --- a/res/drawable-hdpi/ic_imagesize.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_0.png b/res/drawable-hdpi/ic_indicator_ev_0.png Binary files differdeleted file mode 100644 index 9092025db..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_0.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_n1.png b/res/drawable-hdpi/ic_indicator_ev_n1.png Binary files differdeleted file mode 100644 index 56c5e60db..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_n1.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_n2.png b/res/drawable-hdpi/ic_indicator_ev_n2.png Binary files differdeleted file mode 100644 index 72838de43..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_n2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_n3.png b/res/drawable-hdpi/ic_indicator_ev_n3.png Binary files differdeleted file mode 100644 index 1200d631e..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_n3.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_p1.png b/res/drawable-hdpi/ic_indicator_ev_p1.png Binary files differdeleted file mode 100644 index 5497c8672..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_p1.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_p2.png b/res/drawable-hdpi/ic_indicator_ev_p2.png Binary files differdeleted file mode 100644 index 25107fe2f..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_p2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_ev_p3.png b/res/drawable-hdpi/ic_indicator_ev_p3.png Binary files differdeleted file mode 100644 index 6d0c1e023..000000000 --- a/res/drawable-hdpi/ic_indicator_ev_p3.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_flash_auto.png b/res/drawable-hdpi/ic_indicator_flash_auto.png Binary files differdeleted file mode 100644 index edb34a0c6..000000000 --- a/res/drawable-hdpi/ic_indicator_flash_auto.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_flash_off.png b/res/drawable-hdpi/ic_indicator_flash_off.png Binary files differdeleted file mode 100644 index 880ad0773..000000000 --- a/res/drawable-hdpi/ic_indicator_flash_off.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_flash_on.png b/res/drawable-hdpi/ic_indicator_flash_on.png Binary files differdeleted file mode 100644 index ec3d1d529..000000000 --- a/res/drawable-hdpi/ic_indicator_flash_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_hdr_plus_on.png b/res/drawable-hdpi/ic_indicator_hdr_plus_on.png Binary files differdeleted file mode 100644 index 8063990ec..000000000 --- a/res/drawable-hdpi/ic_indicator_hdr_plus_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_loc_off.png b/res/drawable-hdpi/ic_indicator_loc_off.png Binary files differdeleted file mode 100644 index d5937e4d1..000000000 --- a/res/drawable-hdpi/ic_indicator_loc_off.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_loc_on.png b/res/drawable-hdpi/ic_indicator_loc_on.png Binary files differdeleted file mode 100644 index ae272a107..000000000 --- a/res/drawable-hdpi/ic_indicator_loc_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_sce_hdr.png b/res/drawable-hdpi/ic_indicator_sce_hdr.png Binary files differdeleted file mode 100644 index 0b8fdfa13..000000000 --- a/res/drawable-hdpi/ic_indicator_sce_hdr.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_sce_off.png b/res/drawable-hdpi/ic_indicator_sce_off.png Binary files differdeleted file mode 100644 index 09bd2c893..000000000 --- a/res/drawable-hdpi/ic_indicator_sce_off.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_sce_on.png b/res/drawable-hdpi/ic_indicator_sce_on.png Binary files differdeleted file mode 100644 index ef0f56faf..000000000 --- a/res/drawable-hdpi/ic_indicator_sce_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_timer_off.png b/res/drawable-hdpi/ic_indicator_timer_off.png Binary files differdeleted file mode 100644 index e377f89b8..000000000 --- a/res/drawable-hdpi/ic_indicator_timer_off.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicator_timer_on.png b/res/drawable-hdpi/ic_indicator_timer_on.png Binary files differdeleted file mode 100644 index 8ceade651..000000000 --- a/res/drawable-hdpi/ic_indicator_timer_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_location.png b/res/drawable-hdpi/ic_location.png Binary files differdeleted file mode 100644 index ff85d79f1..000000000 --- a/res/drawable-hdpi/ic_location.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_location_off.png b/res/drawable-hdpi/ic_location_off.png Binary files differdeleted file mode 100644 index ae6e2ea23..000000000 --- a/res/drawable-hdpi/ic_location_off.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_edit_holo_dark.png b/res/drawable-hdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index 54952f5d3..000000000 --- a/res/drawable-hdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_share_holo_light.png b/res/drawable-hdpi/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 492d6090c..000000000 --- a/res/drawable-hdpi/ic_menu_share_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_tiny_planet.png b/res/drawable-hdpi/ic_menu_tiny_planet.png Binary files differdeleted file mode 100644 index 12a05511c..000000000 --- a/res/drawable-hdpi/ic_menu_tiny_planet.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_refocus_off_disabled.png b/res/drawable-hdpi/ic_refocus_off_disabled.png Binary files differdeleted file mode 100644 index a64f730e2..000000000 --- a/res/drawable-hdpi/ic_refocus_off_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_refocus_off_indicator.png b/res/drawable-hdpi/ic_refocus_off_indicator.png Binary files differdeleted file mode 100644 index 88f5f091e..000000000 --- a/res/drawable-hdpi/ic_refocus_off_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_refocus_off_normal.png b/res/drawable-hdpi/ic_refocus_off_normal.png Binary files differdeleted file mode 100644 index 93d802375..000000000 --- a/res/drawable-hdpi/ic_refocus_off_normal.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_refocus_on_indicator.png b/res/drawable-hdpi/ic_refocus_on_indicator.png Binary files differdeleted file mode 100644 index 0e7d9b756..000000000 --- a/res/drawable-hdpi/ic_refocus_on_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png Binary files differdeleted file mode 100644 index 5d315a3bb..000000000 --- a/res/drawable-hdpi/ic_settings_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_back.png b/res/drawable-hdpi/ic_switch_back.png Binary files differdeleted file mode 100644 index 02b1c6bd9..000000000 --- a/res/drawable-hdpi/ic_switch_back.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_camera_back_indicator.png b/res/drawable-hdpi/ic_switch_camera_back_indicator.png Binary files differdeleted file mode 100644 index f27eb8df0..000000000 --- a/res/drawable-hdpi/ic_switch_camera_back_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_camera_front_indicator.png b/res/drawable-hdpi/ic_switch_camera_front_indicator.png Binary files differdeleted file mode 100644 index af2bb295c..000000000 --- a/res/drawable-hdpi/ic_switch_camera_front_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_front.png b/res/drawable-hdpi/ic_switch_front.png Binary files differdeleted file mode 100644 index 09cbc24b0..000000000 --- a/res/drawable-hdpi/ic_switch_front.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_pan.png b/res/drawable-hdpi/ic_switch_pan.png Binary files differdeleted file mode 100644 index c8161be3a..000000000 --- a/res/drawable-hdpi/ic_switch_pan.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_photosphere.png b/res/drawable-hdpi/ic_switch_photosphere.png Binary files differdeleted file mode 100644 index ea28eae62..000000000 --- a/res/drawable-hdpi/ic_switch_photosphere.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switcher_menu_indicator.png b/res/drawable-hdpi/ic_switcher_menu_indicator.png Binary files differdeleted file mode 100644 index fc7474ce5..000000000 --- a/res/drawable-hdpi/ic_switcher_menu_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timer_auto_disabled.png b/res/drawable-hdpi/ic_timer_auto_disabled.png Binary files differdeleted file mode 100644 index e9dd24ee2..000000000 --- a/res/drawable-hdpi/ic_timer_auto_disabled.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timer_auto_indicator.png b/res/drawable-hdpi/ic_timer_auto_indicator.png Binary files differdeleted file mode 100644 index e9c370eac..000000000 --- a/res/drawable-hdpi/ic_timer_auto_indicator.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timer_auto_normal.png b/res/drawable-hdpi/ic_timer_auto_normal.png Binary files differdeleted file mode 100644 index 58db51fdf..000000000 --- a/res/drawable-hdpi/ic_timer_auto_normal.png +++ /dev/null diff --git a/res/drawable-hdpi/on_screen_hint_frame.9.png b/res/drawable-hdpi/on_screen_hint_frame.9.png Binary files differdeleted file mode 100644 index 8b78d6705..000000000 --- a/res/drawable-hdpi/on_screen_hint_frame.9.png +++ /dev/null diff --git a/res/drawable-hdpi/toast_frame_holo.9.png b/res/drawable-hdpi/toast_frame_holo.9.png Binary files differdeleted file mode 100644 index f8f75db9b..000000000 --- a/res/drawable-hdpi/toast_frame_holo.9.png +++ /dev/null diff --git a/res/drawable-land-hdpi/switcher_bg.9.png b/res/drawable-land-hdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index dad08d491..000000000 --- a/res/drawable-land-hdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-land-mdpi/switcher_bg.9.png b/res/drawable-land-mdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 207368647..000000000 --- a/res/drawable-land-mdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/switcher_bg.9.png b/res/drawable-land-xhdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index a726dc8fa..000000000 --- a/res/drawable-land-xhdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-mdpi-v19/btn_shutter_recording.png b/res/drawable-mdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index c267939e5..000000000 --- a/res/drawable-mdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-mdpi-v19/btn_shutter_video_default.png b/res/drawable-mdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index e76a1bd0c..000000000 --- a/res/drawable-mdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-mdpi-v19/btn_shutter_video_pressed.png b/res/drawable-mdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index bb8627d0b..000000000 --- a/res/drawable-mdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi-v19/btn_shutter_video_recording.png b/res/drawable-mdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 4f8a39a86..000000000 --- a/res/drawable-mdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-mdpi/background_portrait.jpg b/res/drawable-mdpi/background_portrait.jpg Binary files differdeleted file mode 100644 index 75309b486..000000000 --- a/res/drawable-mdpi/background_portrait.jpg +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_default_disabled.png b/res/drawable-mdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 8285d095e..000000000 --- a/res/drawable-mdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_pressed_disabled.png b/res/drawable-mdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 13cf5dadb..000000000 --- a/res/drawable-mdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_recording.png b/res/drawable-mdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 4906d7073..000000000 --- a/res/drawable-mdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_video_default.png b/res/drawable-mdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 058ee3234..000000000 --- a/res/drawable-mdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_video_pressed.png b/res/drawable-mdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 883c36ee8..000000000 --- a/res/drawable-mdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_shutter_video_recording.png b/res/drawable-mdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index a170ebae7..000000000 --- a/res/drawable-mdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-mdpi/camera_crop.png b/res/drawable-mdpi/camera_crop.png Binary files differdeleted file mode 100644 index cf385641c..000000000 --- a/res/drawable-mdpi/camera_crop.png +++ /dev/null diff --git a/res/drawable-mdpi/focus_ring_touch_inner.png b/res/drawable-mdpi/focus_ring_touch_inner.png Binary files differdeleted file mode 100644 index 98398cf09..000000000 --- a/res/drawable-mdpi/focus_ring_touch_inner.png +++ /dev/null diff --git a/res/drawable-mdpi/focus_ring_touch_outer.png b/res/drawable-mdpi/focus_ring_touch_outer.png Binary files differdeleted file mode 100644 index bee6ec8bb..000000000 --- a/res/drawable-mdpi/focus_ring_touch_outer.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_done_disabled.png b/res/drawable-mdpi/ic_done_disabled.png Binary files differdeleted file mode 100644 index 9cc60673e..000000000 --- a/res/drawable-mdpi/ic_done_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_done_normal.png b/res/drawable-mdpi/ic_done_normal.png Binary files differdeleted file mode 100644 index 107c988bc..000000000 --- a/res/drawable-mdpi/ic_done_normal.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_0_disabled.png b/res/drawable-mdpi/ic_exposure_0_disabled.png Binary files differdeleted file mode 100644 index df3617355..000000000 --- a/res/drawable-mdpi/ic_exposure_0_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_0_indicator.png b/res/drawable-mdpi/ic_exposure_0_indicator.png Binary files differdeleted file mode 100644 index 992b4fbbf..000000000 --- a/res/drawable-mdpi/ic_exposure_0_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_holo_light.png b/res/drawable-mdpi/ic_exposure_holo_light.png Binary files differdeleted file mode 100644 index ebd2f41f5..000000000 --- a/res/drawable-mdpi/ic_exposure_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_indicator.png b/res/drawable-mdpi/ic_exposure_indicator.png Binary files differdeleted file mode 100644 index 585e42176..000000000 --- a/res/drawable-mdpi/ic_exposure_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_n1_disabled.png b/res/drawable-mdpi/ic_exposure_n1_disabled.png Binary files differdeleted file mode 100644 index 457fb4086..000000000 --- a/res/drawable-mdpi/ic_exposure_n1_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_n2_disabled.png b/res/drawable-mdpi/ic_exposure_n2_disabled.png Binary files differdeleted file mode 100644 index 1b2080ab3..000000000 --- a/res/drawable-mdpi/ic_exposure_n2_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_p1_disabled.png b/res/drawable-mdpi/ic_exposure_p1_disabled.png Binary files differdeleted file mode 100644 index 09f7cae56..000000000 --- a/res/drawable-mdpi/ic_exposure_p1_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_exposure_p2_disabled.png b/res/drawable-mdpi/ic_exposure_p2_disabled.png Binary files differdeleted file mode 100644 index 57446021a..000000000 --- a/res/drawable-mdpi/ic_exposure_p2_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_flash_auto_holo_light.png b/res/drawable-mdpi/ic_flash_auto_holo_light.png Binary files differdeleted file mode 100644 index 55794e473..000000000 --- a/res/drawable-mdpi/ic_flash_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_flash_off_holo_light.png b/res/drawable-mdpi/ic_flash_off_holo_light.png Binary files differdeleted file mode 100644 index 73b8ca805..000000000 --- a/res/drawable-mdpi/ic_flash_off_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_flash_on_holo_light.png b/res/drawable-mdpi/ic_flash_on_holo_light.png Binary files differdeleted file mode 100644 index 9c99d37b4..000000000 --- a/res/drawable-mdpi/ic_flash_on_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_hdr_plus_disabled.png b/res/drawable-mdpi/ic_hdr_plus_disabled.png Binary files differdeleted file mode 100644 index 6848b8a74..000000000 --- a/res/drawable-mdpi/ic_hdr_plus_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png Binary files differdeleted file mode 100644 index cb03eca4b..000000000 --- a/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_hdr_plus_normal.png b/res/drawable-mdpi/ic_hdr_plus_normal.png Binary files differdeleted file mode 100644 index 9eed7c7f2..000000000 --- a/res/drawable-mdpi/ic_hdr_plus_normal.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png Binary files differdeleted file mode 100644 index 23e004ae2..000000000 --- a/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_imagesize.png b/res/drawable-mdpi/ic_imagesize.png Binary files differdeleted file mode 100644 index d3f8b62fd..000000000 --- a/res/drawable-mdpi/ic_imagesize.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_0.png b/res/drawable-mdpi/ic_indicator_ev_0.png Binary files differdeleted file mode 100644 index 6634dd9e3..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_0.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_n1.png b/res/drawable-mdpi/ic_indicator_ev_n1.png Binary files differdeleted file mode 100644 index 528ecd39b..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_n1.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_n2.png b/res/drawable-mdpi/ic_indicator_ev_n2.png Binary files differdeleted file mode 100644 index db4deb1a5..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_n2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_n3.png b/res/drawable-mdpi/ic_indicator_ev_n3.png Binary files differdeleted file mode 100644 index 6b01a56d6..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_n3.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_p1.png b/res/drawable-mdpi/ic_indicator_ev_p1.png Binary files differdeleted file mode 100644 index 9a1f6f390..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_p1.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_p2.png b/res/drawable-mdpi/ic_indicator_ev_p2.png Binary files differdeleted file mode 100644 index 712ded53b..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_p2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_ev_p3.png b/res/drawable-mdpi/ic_indicator_ev_p3.png Binary files differdeleted file mode 100644 index d01c2c24f..000000000 --- a/res/drawable-mdpi/ic_indicator_ev_p3.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_flash_auto.png b/res/drawable-mdpi/ic_indicator_flash_auto.png Binary files differdeleted file mode 100644 index c60e423cd..000000000 --- a/res/drawable-mdpi/ic_indicator_flash_auto.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_flash_off.png b/res/drawable-mdpi/ic_indicator_flash_off.png Binary files differdeleted file mode 100644 index 6c2d75a2c..000000000 --- a/res/drawable-mdpi/ic_indicator_flash_off.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_flash_on.png b/res/drawable-mdpi/ic_indicator_flash_on.png Binary files differdeleted file mode 100644 index 84270729e..000000000 --- a/res/drawable-mdpi/ic_indicator_flash_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_hdr_plus_on.png b/res/drawable-mdpi/ic_indicator_hdr_plus_on.png Binary files differdeleted file mode 100644 index 0136cfb65..000000000 --- a/res/drawable-mdpi/ic_indicator_hdr_plus_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_loc_off.png b/res/drawable-mdpi/ic_indicator_loc_off.png Binary files differdeleted file mode 100644 index 87841e321..000000000 --- a/res/drawable-mdpi/ic_indicator_loc_off.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_loc_on.png b/res/drawable-mdpi/ic_indicator_loc_on.png Binary files differdeleted file mode 100644 index 56a3a3b40..000000000 --- a/res/drawable-mdpi/ic_indicator_loc_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_sce_hdr.png b/res/drawable-mdpi/ic_indicator_sce_hdr.png Binary files differdeleted file mode 100644 index 7907f647b..000000000 --- a/res/drawable-mdpi/ic_indicator_sce_hdr.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_sce_off.png b/res/drawable-mdpi/ic_indicator_sce_off.png Binary files differdeleted file mode 100644 index 4bfd91a97..000000000 --- a/res/drawable-mdpi/ic_indicator_sce_off.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_sce_on.png b/res/drawable-mdpi/ic_indicator_sce_on.png Binary files differdeleted file mode 100644 index 6ea6d77c4..000000000 --- a/res/drawable-mdpi/ic_indicator_sce_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_timer_off.png b/res/drawable-mdpi/ic_indicator_timer_off.png Binary files differdeleted file mode 100644 index c5f8117b1..000000000 --- a/res/drawable-mdpi/ic_indicator_timer_off.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicator_timer_on.png b/res/drawable-mdpi/ic_indicator_timer_on.png Binary files differdeleted file mode 100644 index 03d6c1b48..000000000 --- a/res/drawable-mdpi/ic_indicator_timer_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_location.png b/res/drawable-mdpi/ic_location.png Binary files differdeleted file mode 100644 index 57cecbaeb..000000000 --- a/res/drawable-mdpi/ic_location.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_location_off.png b/res/drawable-mdpi/ic_location_off.png Binary files differdeleted file mode 100644 index 548fd96ae..000000000 --- a/res/drawable-mdpi/ic_location_off.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_edit_holo_dark.png b/res/drawable-mdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index ca9188e18..000000000 --- a/res/drawable-mdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_share_holo_light.png b/res/drawable-mdpi/ic_menu_share_holo_light.png Binary files differdeleted file mode 100644 index 29574f5bd..000000000 --- a/res/drawable-mdpi/ic_menu_share_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_tiny_planet.png b/res/drawable-mdpi/ic_menu_tiny_planet.png Binary files differdeleted file mode 100644 index f3c3030c1..000000000 --- a/res/drawable-mdpi/ic_menu_tiny_planet.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_photo_sphere_disabled.png b/res/drawable-mdpi/ic_photo_sphere_disabled.png Binary files differdeleted file mode 100644 index 8bdc68010..000000000 --- a/res/drawable-mdpi/ic_photo_sphere_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_refocus_off_disabled.png b/res/drawable-mdpi/ic_refocus_off_disabled.png Binary files differdeleted file mode 100644 index ad35a6032..000000000 --- a/res/drawable-mdpi/ic_refocus_off_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_refocus_off_indicator.png b/res/drawable-mdpi/ic_refocus_off_indicator.png Binary files differdeleted file mode 100644 index f33c3d311..000000000 --- a/res/drawable-mdpi/ic_refocus_off_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_refocus_off_normal.png b/res/drawable-mdpi/ic_refocus_off_normal.png Binary files differdeleted file mode 100644 index ae3cebb20..000000000 --- a/res/drawable-mdpi/ic_refocus_off_normal.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_refocus_on_indicator.png b/res/drawable-mdpi/ic_refocus_on_indicator.png Binary files differdeleted file mode 100644 index e2d758b29..000000000 --- a/res/drawable-mdpi/ic_refocus_on_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png Binary files differdeleted file mode 100644 index 5b39398c2..000000000 --- a/res/drawable-mdpi/ic_settings_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_back.png b/res/drawable-mdpi/ic_switch_back.png Binary files differdeleted file mode 100644 index 6dce90375..000000000 --- a/res/drawable-mdpi/ic_switch_back.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_camera_back_indicator.png b/res/drawable-mdpi/ic_switch_camera_back_indicator.png Binary files differdeleted file mode 100644 index 48c45e92d..000000000 --- a/res/drawable-mdpi/ic_switch_camera_back_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_camera_front_indicator.png b/res/drawable-mdpi/ic_switch_camera_front_indicator.png Binary files differdeleted file mode 100644 index 6e9dbb702..000000000 --- a/res/drawable-mdpi/ic_switch_camera_front_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_front.png b/res/drawable-mdpi/ic_switch_front.png Binary files differdeleted file mode 100644 index c8ff3be62..000000000 --- a/res/drawable-mdpi/ic_switch_front.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_pan.png b/res/drawable-mdpi/ic_switch_pan.png Binary files differdeleted file mode 100644 index e63b8e968..000000000 --- a/res/drawable-mdpi/ic_switch_pan.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_photosphere.png b/res/drawable-mdpi/ic_switch_photosphere.png Binary files differdeleted file mode 100644 index 1b8db05a1..000000000 --- a/res/drawable-mdpi/ic_switch_photosphere.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switcher_menu_indicator.png b/res/drawable-mdpi/ic_switcher_menu_indicator.png Binary files differdeleted file mode 100644 index d6c72bcf2..000000000 --- a/res/drawable-mdpi/ic_switcher_menu_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timer_auto_disabled.png b/res/drawable-mdpi/ic_timer_auto_disabled.png Binary files differdeleted file mode 100644 index 5a23bf66d..000000000 --- a/res/drawable-mdpi/ic_timer_auto_disabled.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timer_auto_indicator.png b/res/drawable-mdpi/ic_timer_auto_indicator.png Binary files differdeleted file mode 100644 index 8f60aa99c..000000000 --- a/res/drawable-mdpi/ic_timer_auto_indicator.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timer_auto_normal.png b/res/drawable-mdpi/ic_timer_auto_normal.png Binary files differdeleted file mode 100644 index cea9daf3b..000000000 --- a/res/drawable-mdpi/ic_timer_auto_normal.png +++ /dev/null diff --git a/res/drawable-mdpi/on_screen_hint_frame.9.png b/res/drawable-mdpi/on_screen_hint_frame.9.png Binary files differdeleted file mode 100644 index 8b78d6705..000000000 --- a/res/drawable-mdpi/on_screen_hint_frame.9.png +++ /dev/null diff --git a/res/drawable-mdpi/toast_frame_holo.9.png b/res/drawable-mdpi/toast_frame_holo.9.png Binary files differdeleted file mode 100644 index f8f75db9b..000000000 --- a/res/drawable-mdpi/toast_frame_holo.9.png +++ /dev/null diff --git a/res/drawable-nodpi/brush_marker.png b/res/drawable-nodpi/brush_marker.png Binary files differdeleted file mode 100644 index 24eb7476c..000000000 --- a/res/drawable-nodpi/brush_marker.png +++ /dev/null diff --git a/res/drawable-nodpi/brush_spatter.png b/res/drawable-nodpi/brush_spatter.png Binary files differdeleted file mode 100644 index ae15c221c..000000000 --- a/res/drawable-nodpi/brush_spatter.png +++ /dev/null diff --git a/res/drawable-nodpi/geometry_shadow.9.png b/res/drawable-nodpi/geometry_shadow.9.png Binary files differdeleted file mode 100644 index 2f7abdc08..000000000 --- a/res/drawable-nodpi/geometry_shadow.9.png +++ /dev/null diff --git a/res/drawable-port-hdpi/switcher_bg.9.png b/res/drawable-port-hdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index e6b74a4d6..000000000 --- a/res/drawable-port-hdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-port-mdpi/switcher_bg.9.png b/res/drawable-port-mdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 6c87aa365..000000000 --- a/res/drawable-port-mdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/switcher_bg.9.png b/res/drawable-port-xhdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index bbe21ba3f..000000000 --- a/res/drawable-port-xhdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 512055cf4..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index cc3c0ef07..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index d5dd2184d..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index d3030ed70..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index f6204a78d..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index d7fee7980..000000000 --- a/res/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi-v19/switcher_bg.9.png b/res/drawable-sw600dp-hdpi-v19/switcher_bg.9.png Binary files differdeleted file mode 100644 index b12785f8c..000000000 --- a/res/drawable-sw600dp-hdpi-v19/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index c84311d1f..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 5021f3446..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_recording.png b/res/drawable-sw600dp-hdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index ad4b9909e..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_video_default.png b/res/drawable-sw600dp-hdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 7ba9b20ec..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png b/res/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index ce2eb6651..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_video_recording.png b/res/drawable-sw600dp-hdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index abbb46ad4..000000000 --- a/res/drawable-sw600dp-hdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 21375b1d1..000000000 --- a/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index bfd996a4f..000000000 --- a/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 35a71db8b..000000000 --- a/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 7fd7f7d7e..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 9ba8aa009..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_recording.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 5fe740b50..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_default.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index e38f4d270..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 4180fa3fe..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_recording.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 8aeadc6d6..000000000 --- a/res/drawable-sw600dp-mdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 86ac78faa..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index b9940d7ff..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_recording.png b/res/drawable-sw600dp-mdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 8c28b189e..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_video_default.png b/res/drawable-sw600dp-mdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 87a0a0330..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png b/res/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 1e4d21880..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_video_recording.png b/res/drawable-sw600dp-mdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index a7865f55a..000000000 --- a/res/drawable-sw600dp-mdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 250276aa0..000000000 --- a/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 9c4e293ba..000000000 --- a/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png Binary files differdeleted file mode 100644 index 2d0171eb8..000000000 --- a/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 989ea8e9a..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 97897099c..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_recording.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 50e84cbcb..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_default.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index c826fe878..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index bc1981e6f..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_recording.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 36d6221a0..000000000 --- a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index f272314b9..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index d7be54e07..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_recording.png b/res/drawable-sw600dp-xhdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index e91347b9a..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_video_default.png b/res/drawable-sw600dp-xhdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 053662806..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png b/res/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index a1bebd86a..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png b/res/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 6d1363443..000000000 --- a/res/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 2f4a965bf..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 86c469dca..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_recording.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 7dbf092e7..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_default.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 6569c79aa..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index eb89ed394..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_recording.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 52145b420..000000000 --- a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 565bd4141..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index 17cc880d0..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_recording.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 7dbf092e7..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_default.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 6569c79aa..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_pressed.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 51ea45b5d..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_recording.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 52145b420..000000000 --- a/res/drawable-sw600dp-xxhdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-sw600dp/bg_vidcontrol.png b/res/drawable-sw600dp/bg_vidcontrol.png Binary files differdeleted file mode 100644 index dfe2da136..000000000 --- a/res/drawable-sw600dp/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_pan_thumb.9.png b/res/drawable-sw600dp/ic_pan_thumb.9.png Binary files differdeleted file mode 100644 index 1648026cc..000000000 --- a/res/drawable-sw600dp/ic_pan_thumb.9.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_vidcontrol_pause.png b/res/drawable-sw600dp/ic_vidcontrol_pause.png Binary files differdeleted file mode 100644 index 3d1a8bf5c..000000000 --- a/res/drawable-sw600dp/ic_vidcontrol_pause.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_vidcontrol_play.png b/res/drawable-sw600dp/ic_vidcontrol_play.png Binary files differdeleted file mode 100644 index cc021667a..000000000 --- a/res/drawable-sw600dp/ic_vidcontrol_play.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_vidcontrol_reload.png b/res/drawable-sw600dp/ic_vidcontrol_reload.png Binary files differdeleted file mode 100644 index bf8d5299c..000000000 --- a/res/drawable-sw600dp/ic_vidcontrol_reload.png +++ /dev/null diff --git a/res/drawable-sw600dp/ic_video_thumb.png b/res/drawable-sw600dp/ic_video_thumb.png Binary files differdeleted file mode 100644 index 743cec2bd..000000000 --- a/res/drawable-sw600dp/ic_video_thumb.png +++ /dev/null diff --git a/res/drawable-sw600dp/scrubber_knob.png b/res/drawable-sw600dp/scrubber_knob.png Binary files differdeleted file mode 100644 index 426e3daff..000000000 --- a/res/drawable-sw600dp/scrubber_knob.png +++ /dev/null diff --git a/res/drawable-xhdpi-v19/btn_shutter_recording.png b/res/drawable-xhdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index d6aa8be38..000000000 --- a/res/drawable-xhdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-xhdpi-v19/btn_shutter_video_default.png b/res/drawable-xhdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index beb1e82a4..000000000 --- a/res/drawable-xhdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-xhdpi-v19/btn_shutter_video_pressed.png b/res/drawable-xhdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 163d888df..000000000 --- a/res/drawable-xhdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi-v19/btn_shutter_video_recording.png b/res/drawable-xhdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 630bb57f8..000000000 --- a/res/drawable-xhdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_default_disabled.png b/res/drawable-xhdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index 1151b4b5c..000000000 --- a/res/drawable-xhdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_pressed_disabled.png b/res/drawable-xhdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index e983954f9..000000000 --- a/res/drawable-xhdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_recording.png b/res/drawable-xhdpi/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 1bd1743ad..000000000 --- a/res/drawable-xhdpi/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_video_default.png b/res/drawable-xhdpi/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 10482f56c..000000000 --- a/res/drawable-xhdpi/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_video_pressed.png b/res/drawable-xhdpi/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index 35f1ddc95..000000000 --- a/res/drawable-xhdpi/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_shutter_video_recording.png b/res/drawable-xhdpi/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index ba1fb5caa..000000000 --- a/res/drawable-xhdpi/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-xhdpi/camera_crop.png b/res/drawable-xhdpi/camera_crop.png Binary files differdeleted file mode 100644 index e0a53bcc9..000000000 --- a/res/drawable-xhdpi/camera_crop.png +++ /dev/null diff --git a/res/drawable-xhdpi/focus_ring_touch_inner.png b/res/drawable-xhdpi/focus_ring_touch_inner.png Binary files differdeleted file mode 100644 index 2109a4ecf..000000000 --- a/res/drawable-xhdpi/focus_ring_touch_inner.png +++ /dev/null diff --git a/res/drawable-xhdpi/focus_ring_touch_outer.png b/res/drawable-xhdpi/focus_ring_touch_outer.png Binary files differdeleted file mode 100644 index 5010d9b23..000000000 --- a/res/drawable-xhdpi/focus_ring_touch_outer.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_done_disabled.png b/res/drawable-xhdpi/ic_done_disabled.png Binary files differdeleted file mode 100644 index b2b2a62e4..000000000 --- a/res/drawable-xhdpi/ic_done_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_done_normal.png b/res/drawable-xhdpi/ic_done_normal.png Binary files differdeleted file mode 100644 index ed4edd52f..000000000 --- a/res/drawable-xhdpi/ic_done_normal.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_0_disabled.png b/res/drawable-xhdpi/ic_exposure_0_disabled.png Binary files differdeleted file mode 100644 index 1a3d8a835..000000000 --- a/res/drawable-xhdpi/ic_exposure_0_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_0_indicator.png b/res/drawable-xhdpi/ic_exposure_0_indicator.png Binary files differdeleted file mode 100644 index e4400f468..000000000 --- a/res/drawable-xhdpi/ic_exposure_0_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_holo_light.png b/res/drawable-xhdpi/ic_exposure_holo_light.png Binary files differdeleted file mode 100644 index 06501adfb..000000000 --- a/res/drawable-xhdpi/ic_exposure_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_indicator.png b/res/drawable-xhdpi/ic_exposure_indicator.png Binary files differdeleted file mode 100644 index 334203b04..000000000 --- a/res/drawable-xhdpi/ic_exposure_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_n1_disabled.png b/res/drawable-xhdpi/ic_exposure_n1_disabled.png Binary files differdeleted file mode 100644 index 95c9e6f85..000000000 --- a/res/drawable-xhdpi/ic_exposure_n1_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_n2_disabled.png b/res/drawable-xhdpi/ic_exposure_n2_disabled.png Binary files differdeleted file mode 100644 index 5e412be1e..000000000 --- a/res/drawable-xhdpi/ic_exposure_n2_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_p1_disabled.png b/res/drawable-xhdpi/ic_exposure_p1_disabled.png Binary files differdeleted file mode 100644 index 482688adf..000000000 --- a/res/drawable-xhdpi/ic_exposure_p1_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_exposure_p2_disabled.png b/res/drawable-xhdpi/ic_exposure_p2_disabled.png Binary files differdeleted file mode 100644 index 4596cd99f..000000000 --- a/res/drawable-xhdpi/ic_exposure_p2_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-xhdpi/ic_flash_auto_holo_light.png Binary files differdeleted file mode 100644 index 266d1c27c..000000000 --- a/res/drawable-xhdpi/ic_flash_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_flash_off_holo_light.png b/res/drawable-xhdpi/ic_flash_off_holo_light.png Binary files differdeleted file mode 100644 index e289ac215..000000000 --- a/res/drawable-xhdpi/ic_flash_off_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_flash_on_holo_light.png b/res/drawable-xhdpi/ic_flash_on_holo_light.png Binary files differdeleted file mode 100644 index e2c63c7ca..000000000 --- a/res/drawable-xhdpi/ic_flash_on_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_hdr_plus_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_disabled.png Binary files differdeleted file mode 100644 index dfa143956..000000000 --- a/res/drawable-xhdpi/ic_hdr_plus_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png Binary files differdeleted file mode 100644 index 09ec51ac8..000000000 --- a/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_hdr_plus_normal.png b/res/drawable-xhdpi/ic_hdr_plus_normal.png Binary files differdeleted file mode 100644 index 834cce737..000000000 --- a/res/drawable-xhdpi/ic_hdr_plus_normal.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png Binary files differdeleted file mode 100644 index 3e3cc649f..000000000 --- a/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_imagesize.png b/res/drawable-xhdpi/ic_imagesize.png Binary files differdeleted file mode 100644 index 54fd00825..000000000 --- a/res/drawable-xhdpi/ic_imagesize.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_0.png b/res/drawable-xhdpi/ic_indicator_ev_0.png Binary files differdeleted file mode 100644 index b86bb301a..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_0.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_n1.png b/res/drawable-xhdpi/ic_indicator_ev_n1.png Binary files differdeleted file mode 100644 index e99cc6601..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_n1.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_n2.png b/res/drawable-xhdpi/ic_indicator_ev_n2.png Binary files differdeleted file mode 100644 index aced71d2d..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_n2.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_n3.png b/res/drawable-xhdpi/ic_indicator_ev_n3.png Binary files differdeleted file mode 100644 index 41b9f5961..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_n3.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_p1.png b/res/drawable-xhdpi/ic_indicator_ev_p1.png Binary files differdeleted file mode 100644 index 2850c9555..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_p1.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_p2.png b/res/drawable-xhdpi/ic_indicator_ev_p2.png Binary files differdeleted file mode 100644 index c6355b138..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_p2.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_ev_p3.png b/res/drawable-xhdpi/ic_indicator_ev_p3.png Binary files differdeleted file mode 100644 index 99b860dd7..000000000 --- a/res/drawable-xhdpi/ic_indicator_ev_p3.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_flash_auto.png b/res/drawable-xhdpi/ic_indicator_flash_auto.png Binary files differdeleted file mode 100644 index 08f507b2a..000000000 --- a/res/drawable-xhdpi/ic_indicator_flash_auto.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_flash_off.png b/res/drawable-xhdpi/ic_indicator_flash_off.png Binary files differdeleted file mode 100644 index a3580f1a1..000000000 --- a/res/drawable-xhdpi/ic_indicator_flash_off.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_flash_on.png b/res/drawable-xhdpi/ic_indicator_flash_on.png Binary files differdeleted file mode 100644 index 7e05e156e..000000000 --- a/res/drawable-xhdpi/ic_indicator_flash_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png b/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png Binary files differdeleted file mode 100644 index 07b891614..000000000 --- a/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_loc_off.png b/res/drawable-xhdpi/ic_indicator_loc_off.png Binary files differdeleted file mode 100644 index 966855c54..000000000 --- a/res/drawable-xhdpi/ic_indicator_loc_off.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_loc_on.png b/res/drawable-xhdpi/ic_indicator_loc_on.png Binary files differdeleted file mode 100644 index 3a4b44e2e..000000000 --- a/res/drawable-xhdpi/ic_indicator_loc_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_sce_hdr.png b/res/drawable-xhdpi/ic_indicator_sce_hdr.png Binary files differdeleted file mode 100644 index 318c8fa6b..000000000 --- a/res/drawable-xhdpi/ic_indicator_sce_hdr.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_sce_off.png b/res/drawable-xhdpi/ic_indicator_sce_off.png Binary files differdeleted file mode 100644 index 429d6ec79..000000000 --- a/res/drawable-xhdpi/ic_indicator_sce_off.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_sce_on.png b/res/drawable-xhdpi/ic_indicator_sce_on.png Binary files differdeleted file mode 100644 index 8b2440c57..000000000 --- a/res/drawable-xhdpi/ic_indicator_sce_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_timer_off.png b/res/drawable-xhdpi/ic_indicator_timer_off.png Binary files differdeleted file mode 100644 index 0bbb9ee36..000000000 --- a/res/drawable-xhdpi/ic_indicator_timer_off.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicator_timer_on.png b/res/drawable-xhdpi/ic_indicator_timer_on.png Binary files differdeleted file mode 100644 index 07cef150e..000000000 --- a/res/drawable-xhdpi/ic_indicator_timer_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_location.png b/res/drawable-xhdpi/ic_location.png Binary files differdeleted file mode 100644 index ab553dc82..000000000 --- a/res/drawable-xhdpi/ic_location.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_location_off.png b/res/drawable-xhdpi/ic_location_off.png Binary files differdeleted file mode 100644 index 24594d138..000000000 --- a/res/drawable-xhdpi/ic_location_off.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png b/res/drawable-xhdpi/ic_menu_edit_holo_dark.png Binary files differdeleted file mode 100644 index 65e72c1e2..000000000 --- a/res/drawable-xhdpi/ic_menu_edit_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_savephoto.png b/res/drawable-xhdpi/ic_menu_savephoto.png Binary files differdeleted file mode 100644 index 4b1210a11..000000000 --- a/res/drawable-xhdpi/ic_menu_savephoto.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_savephoto_disabled.png b/res/drawable-xhdpi/ic_menu_savephoto_disabled.png Binary files differdeleted file mode 100755 index fab1c5582..000000000 --- a/res/drawable-xhdpi/ic_menu_savephoto_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_tiny_planet.png b/res/drawable-xhdpi/ic_menu_tiny_planet.png Binary files differdeleted file mode 100644 index 565c7d26b..000000000 --- a/res/drawable-xhdpi/ic_menu_tiny_planet.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_refocus_off_disabled.png b/res/drawable-xhdpi/ic_refocus_off_disabled.png Binary files differdeleted file mode 100644 index b46cf1af2..000000000 --- a/res/drawable-xhdpi/ic_refocus_off_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_refocus_off_indicator.png b/res/drawable-xhdpi/ic_refocus_off_indicator.png Binary files differdeleted file mode 100644 index a15e80654..000000000 --- a/res/drawable-xhdpi/ic_refocus_off_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_refocus_off_normal.png b/res/drawable-xhdpi/ic_refocus_off_normal.png Binary files differdeleted file mode 100644 index b59c76d1b..000000000 --- a/res/drawable-xhdpi/ic_refocus_off_normal.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_refocus_on_indicator.png b/res/drawable-xhdpi/ic_refocus_on_indicator.png Binary files differdeleted file mode 100644 index 71eb72b3c..000000000 --- a/res/drawable-xhdpi/ic_refocus_on_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png Binary files differdeleted file mode 100644 index 0da5b5eab..000000000 --- a/res/drawable-xhdpi/ic_settings_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_back.png b/res/drawable-xhdpi/ic_switch_back.png Binary files differdeleted file mode 100644 index 26f5e099f..000000000 --- a/res/drawable-xhdpi/ic_switch_back.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xhdpi/ic_switch_camera_back_indicator.png Binary files differdeleted file mode 100644 index a68dd654b..000000000 --- a/res/drawable-xhdpi/ic_switch_camera_back_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xhdpi/ic_switch_camera_front_indicator.png Binary files differdeleted file mode 100644 index 37baad5b6..000000000 --- a/res/drawable-xhdpi/ic_switch_camera_front_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_front.png b/res/drawable-xhdpi/ic_switch_front.png Binary files differdeleted file mode 100644 index 8c0383a6a..000000000 --- a/res/drawable-xhdpi/ic_switch_front.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_pan.png b/res/drawable-xhdpi/ic_switch_pan.png Binary files differdeleted file mode 100644 index f17ce2f4a..000000000 --- a/res/drawable-xhdpi/ic_switch_pan.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_photosphere.png b/res/drawable-xhdpi/ic_switch_photosphere.png Binary files differdeleted file mode 100644 index 8ff60a3da..000000000 --- a/res/drawable-xhdpi/ic_switch_photosphere.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_refocus.png b/res/drawable-xhdpi/ic_switch_refocus.png Binary files differdeleted file mode 100644 index 3175f35ae..000000000 --- a/res/drawable-xhdpi/ic_switch_refocus.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switcher_menu_indicator.png b/res/drawable-xhdpi/ic_switcher_menu_indicator.png Binary files differdeleted file mode 100644 index 36252ce26..000000000 --- a/res/drawable-xhdpi/ic_switcher_menu_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timer_auto_disabled.png b/res/drawable-xhdpi/ic_timer_auto_disabled.png Binary files differdeleted file mode 100644 index ab708b68a..000000000 --- a/res/drawable-xhdpi/ic_timer_auto_disabled.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timer_auto_indicator.png b/res/drawable-xhdpi/ic_timer_auto_indicator.png Binary files differdeleted file mode 100644 index c361b7635..000000000 --- a/res/drawable-xhdpi/ic_timer_auto_indicator.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timer_auto_normal.png b/res/drawable-xhdpi/ic_timer_auto_normal.png Binary files differdeleted file mode 100644 index 740c20587..000000000 --- a/res/drawable-xhdpi/ic_timer_auto_normal.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_view_rgbz.png b/res/drawable-xhdpi/ic_view_rgbz.png Binary files differdeleted file mode 100644 index 1bf9b7603..000000000 --- a/res/drawable-xhdpi/ic_view_rgbz.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png b/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png Binary files differdeleted file mode 100644 index e85103da2..000000000 --- a/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_bg_holo_dark.9.png b/res/drawable-xhdpi/switch_bg_holo_dark.9.png Binary files differdeleted file mode 100644 index 732481e59..000000000 --- a/res/drawable-xhdpi/switch_bg_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png b/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png Binary files differdeleted file mode 100644 index ca48bd866..000000000 --- a/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png b/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png Binary files differdeleted file mode 100644 index c3d80f0eb..000000000 --- a/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_thumb_holo_dark.9.png b/res/drawable-xhdpi/switch_thumb_holo_dark.9.png Binary files differdeleted file mode 100644 index df236df82..000000000 --- a/res/drawable-xhdpi/switch_thumb_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png b/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png Binary files differdeleted file mode 100644 index 4acb32b19..000000000 --- a/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/toast_frame_holo.9.png b/res/drawable-xhdpi/toast_frame_holo.9.png Binary files differdeleted file mode 100644 index f8f75db9b..000000000 --- a/res/drawable-xhdpi/toast_frame_holo.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi-v19/btn_shutter_recording.png b/res/drawable-xxhdpi-v19/btn_shutter_recording.png Binary files differdeleted file mode 100644 index 090affca8..000000000 --- a/res/drawable-xxhdpi-v19/btn_shutter_recording.png +++ /dev/null diff --git a/res/drawable-xxhdpi-v19/btn_shutter_video_default.png b/res/drawable-xxhdpi-v19/btn_shutter_video_default.png Binary files differdeleted file mode 100644 index 52cb801b0..000000000 --- a/res/drawable-xxhdpi-v19/btn_shutter_video_default.png +++ /dev/null diff --git a/res/drawable-xxhdpi-v19/btn_shutter_video_pressed.png b/res/drawable-xxhdpi-v19/btn_shutter_video_pressed.png Binary files differdeleted file mode 100644 index f414a3e33..000000000 --- a/res/drawable-xxhdpi-v19/btn_shutter_video_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi-v19/btn_shutter_video_recording.png b/res/drawable-xxhdpi-v19/btn_shutter_video_recording.png Binary files differdeleted file mode 100644 index 6e143c84c..000000000 --- a/res/drawable-xxhdpi-v19/btn_shutter_video_recording.png +++ /dev/null diff --git a/res/drawable-xxhdpi/btn_shutter_default_disabled.png b/res/drawable-xxhdpi/btn_shutter_default_disabled.png Binary files differdeleted file mode 100644 index f515abf20..000000000 --- a/res/drawable-xxhdpi/btn_shutter_default_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png b/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png Binary files differdeleted file mode 100644 index e19718bea..000000000 --- a/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/focus_ring_touch_inner.png b/res/drawable-xxhdpi/focus_ring_touch_inner.png Binary files differdeleted file mode 100644 index 8d3dd6f38..000000000 --- a/res/drawable-xxhdpi/focus_ring_touch_inner.png +++ /dev/null diff --git a/res/drawable-xxhdpi/focus_ring_touch_outer.png b/res/drawable-xxhdpi/focus_ring_touch_outer.png Binary files differdeleted file mode 100644 index 66d0b9cd8..000000000 --- a/res/drawable-xxhdpi/focus_ring_touch_outer.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_done_disabled.png b/res/drawable-xxhdpi/ic_done_disabled.png Binary files differdeleted file mode 100644 index 1da358daf..000000000 --- a/res/drawable-xxhdpi/ic_done_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_done_normal.png b/res/drawable-xxhdpi/ic_done_normal.png Binary files differdeleted file mode 100644 index 4bf940691..000000000 --- a/res/drawable-xxhdpi/ic_done_normal.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_0_disabled.png b/res/drawable-xxhdpi/ic_exposure_0_disabled.png Binary files differdeleted file mode 100644 index 281f255b8..000000000 --- a/res/drawable-xxhdpi/ic_exposure_0_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_0_indicator.png b/res/drawable-xxhdpi/ic_exposure_0_indicator.png Binary files differdeleted file mode 100644 index 5f6479c50..000000000 --- a/res/drawable-xxhdpi/ic_exposure_0_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_indicator.png b/res/drawable-xxhdpi/ic_exposure_indicator.png Binary files differdeleted file mode 100644 index a8b867940..000000000 --- a/res/drawable-xxhdpi/ic_exposure_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_n1_disabled.png b/res/drawable-xxhdpi/ic_exposure_n1_disabled.png Binary files differdeleted file mode 100644 index 9e2c44e94..000000000 --- a/res/drawable-xxhdpi/ic_exposure_n1_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_n2_disabled.png b/res/drawable-xxhdpi/ic_exposure_n2_disabled.png Binary files differdeleted file mode 100644 index 5b021893a..000000000 --- a/res/drawable-xxhdpi/ic_exposure_n2_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_p1_disabled.png b/res/drawable-xxhdpi/ic_exposure_p1_disabled.png Binary files differdeleted file mode 100644 index f89bf7e56..000000000 --- a/res/drawable-xxhdpi/ic_exposure_p1_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_exposure_p2_disabled.png b/res/drawable-xxhdpi/ic_exposure_p2_disabled.png Binary files differdeleted file mode 100644 index c81205433..000000000 --- a/res/drawable-xxhdpi/ic_exposure_p2_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_hdr_plus_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_disabled.png Binary files differdeleted file mode 100644 index e5f57e32d..000000000 --- a/res/drawable-xxhdpi/ic_hdr_plus_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png Binary files differdeleted file mode 100644 index 3c368a805..000000000 --- a/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_hdr_plus_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_normal.png Binary files differdeleted file mode 100644 index 935899bce..000000000 --- a/res/drawable-xxhdpi/ic_hdr_plus_normal.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png Binary files differdeleted file mode 100644 index 4196c715c..000000000 --- a/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png b/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png Binary files differdeleted file mode 100644 index 13f29c27b..000000000 --- a/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_refocus_off_disabled.png b/res/drawable-xxhdpi/ic_refocus_off_disabled.png Binary files differdeleted file mode 100644 index 135ed3552..000000000 --- a/res/drawable-xxhdpi/ic_refocus_off_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_refocus_off_indicator.png b/res/drawable-xxhdpi/ic_refocus_off_indicator.png Binary files differdeleted file mode 100644 index fae486b27..000000000 --- a/res/drawable-xxhdpi/ic_refocus_off_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_refocus_off_normal.png b/res/drawable-xxhdpi/ic_refocus_off_normal.png Binary files differdeleted file mode 100644 index 6da6b4675..000000000 --- a/res/drawable-xxhdpi/ic_refocus_off_normal.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_refocus_on_indicator.png b/res/drawable-xxhdpi/ic_refocus_on_indicator.png Binary files differdeleted file mode 100644 index a8529b5fc..000000000 --- a/res/drawable-xxhdpi/ic_refocus_on_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png Binary files differdeleted file mode 100644 index 6e3e9304b..000000000 --- a/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png Binary files differdeleted file mode 100644 index a5e0529cd..000000000 --- a/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_timer_auto_disabled.png b/res/drawable-xxhdpi/ic_timer_auto_disabled.png Binary files differdeleted file mode 100644 index 527efc2ad..000000000 --- a/res/drawable-xxhdpi/ic_timer_auto_disabled.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_timer_auto_indicator.png b/res/drawable-xxhdpi/ic_timer_auto_indicator.png Binary files differdeleted file mode 100644 index dc2ed0268..000000000 --- a/res/drawable-xxhdpi/ic_timer_auto_indicator.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_timer_auto_normal.png b/res/drawable-xxhdpi/ic_timer_auto_normal.png Binary files differdeleted file mode 100644 index 2bafa3bb1..000000000 --- a/res/drawable-xxhdpi/ic_timer_auto_normal.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_0_disabled.png b/res/drawable-xxxhdpi/ic_exposure_0_disabled.png Binary files differdeleted file mode 100644 index 9b83330ed..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_0_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_0_indicator.png b/res/drawable-xxxhdpi/ic_exposure_0_indicator.png Binary files differdeleted file mode 100644 index 700b011a4..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_0_indicator.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_indicator.png b/res/drawable-xxxhdpi/ic_exposure_indicator.png Binary files differdeleted file mode 100644 index 72d418b76..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_indicator.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png b/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png Binary files differdeleted file mode 100644 index 4a3acbedd..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png b/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png Binary files differdeleted file mode 100644 index 391b63c11..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png b/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png Binary files differdeleted file mode 100644 index 5e93cd9e6..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png b/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png Binary files differdeleted file mode 100644 index 0bb19b71c..000000000 --- a/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png Binary files differdeleted file mode 100644 index 80fa60cd4..000000000 --- a/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png Binary files differdeleted file mode 100644 index d19631d5c..000000000 --- a/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_timer_auto_disabled.png b/res/drawable-xxxhdpi/ic_timer_auto_disabled.png Binary files differdeleted file mode 100644 index bd02146d3..000000000 --- a/res/drawable-xxxhdpi/ic_timer_auto_disabled.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_timer_auto_indicator.png b/res/drawable-xxxhdpi/ic_timer_auto_indicator.png Binary files differdeleted file mode 100644 index 6e8118bf0..000000000 --- a/res/drawable-xxxhdpi/ic_timer_auto_indicator.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ic_timer_auto_normal.png b/res/drawable-xxxhdpi/ic_timer_auto_normal.png Binary files differdeleted file mode 100644 index aa9e6f111..000000000 --- a/res/drawable-xxxhdpi/ic_timer_auto_normal.png +++ /dev/null diff --git a/res/drawable/btn_new_shutter_video.xml b/res/drawable/btn_new_shutter_video.xml deleted file mode 100644 index e87b456f6..000000000 --- a/res/drawable/btn_new_shutter_video.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/btn_shutter_video_pressed" /> - <item android:drawable="@drawable/btn_shutter_video_default" /> -</selector> - diff --git a/res/drawable/btn_shutter_disabled.xml b/res/drawable/btn_shutter_disabled.xml deleted file mode 100644 index 865d83c38..000000000 --- a/res/drawable/btn_shutter_disabled.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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:state_pressed="true" android:drawable="@drawable/btn_shutter_pressed_disabled" /> - <item android:drawable="@drawable/btn_shutter_default_disabled" /> -</selector> - diff --git a/res/drawable/button_background_dark.xml b/res/drawable/button_background_dark.xml deleted file mode 100644 index a2718dabc..000000000 --- a/res/drawable/button_background_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:state_pressed="true" - android:drawable="@drawable/button_background_pressed_dark" /> -</selector>
\ No newline at end of file diff --git a/res/drawable/crop_tiled_background.xml b/res/drawable/crop_tiled_background.xml deleted file mode 100644 index 751234ce0..000000000 --- a/res/drawable/crop_tiled_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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. ---> -<bitmap - xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/crop_background" - android:tileMode="repeat" - android:dither="false" />
\ No newline at end of file diff --git a/res/drawable/ic_switch_gcam.png b/res/drawable/ic_switch_gcam.png Binary files differdeleted file mode 100644 index 84fe825da..000000000 --- a/res/drawable/ic_switch_gcam.png +++ /dev/null diff --git a/res/drawable/menu_save_photo.xml b/res/drawable/menu_save_photo.xml deleted file mode 100644 index 0b92ac968..000000000 --- a/res/drawable/menu_save_photo.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:state_enabled="true" android:drawable="@drawable/ic_menu_savephoto" /> - <item android:state_enabled="false" android:drawable="@drawable/ic_menu_savephoto_disabled" /> -</selector> diff --git a/res/drawable/mode_icon_highlight.xml b/res/drawable/mode_icon_highlight.xml deleted file mode 100644 index c5a4e9106..000000000 --- a/res/drawable/mode_icon_highlight.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> - -<shape - xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="ring" - android:thickness="3dp" - android:useLevel="false" - android:innerRadius="25dp" > - - <solid - android:color="@color/mode_selector_icon_background"/> - - <size - android:width="@dimen/mode_selector_icon_block_width" - android:height="@dimen/mode_selector_icon_block_width" /> -</shape>
\ No newline at end of file diff --git a/res/drawable/pano_direction_left_indicator.xml b/res/drawable/pano_direction_left_indicator.xml deleted file mode 100644 index a0bfb0af3..000000000 --- a/res/drawable/pano_direction_left_indicator.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:state_enabled="false" - android:drawable="@drawable/ic_pan_left_indicator" /> - <item android:drawable="@drawable/ic_pan_left_indicator_fast" /> -</selector> diff --git a/res/drawable/pano_direction_right_indicator.xml b/res/drawable/pano_direction_right_indicator.xml deleted file mode 100644 index c3ce37797..000000000 --- a/res/drawable/pano_direction_right_indicator.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:state_enabled="false" - android:drawable="@drawable/ic_pan_right_indicator" /> - <item android:drawable="@drawable/ic_pan_right_indicator_fast" /> -</selector> diff --git a/res/drawable/setting_picker.xml b/res/drawable/setting_picker.xml deleted file mode 100644 index c3bff41ea..000000000 --- a/res/drawable/setting_picker.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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:state_checked="true" - android:drawable="@drawable/list_pressed_holo_light" /> - <item android:drawable="@android:color/transparent" /> -</selector> diff --git a/res/drawable/switch_inner_holo_dark.xml b/res/drawable/switch_inner_holo_dark.xml deleted file mode 100644 index c0b00bb83..000000000 --- a/res/drawable/switch_inner_holo_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_dark" /> - <item android:state_pressed="true" android:drawable="@drawable/switch_thumb_pressed_holo_dark" /> - <item android:state_checked="true" android:drawable="@drawable/switch_thumb_activated_holo_dark" /> - <item android:drawable="@drawable/switch_thumb_holo_dark" /> -</selector> diff --git a/res/drawable/switch_track_holo_dark.xml b/res/drawable/switch_track_holo_dark.xml deleted file mode 100644 index 3712a6145..000000000 --- a/res/drawable/switch_track_holo_dark.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/switch_bg_focused_holo_dark" /> - <item android:drawable="@drawable/switch_bg_holo_dark" /> -</selector> diff --git a/res_p/drawable-hdpi/ic_panorama_disabled.png b/res_p/drawable-hdpi/ic_panorama_disabled.png Binary files differdeleted file mode 100644 index 59e6048df..000000000 --- a/res_p/drawable-hdpi/ic_panorama_disabled.png +++ /dev/null diff --git a/res_p/drawable-hdpi/ic_photosphere_disabled.png b/res_p/drawable-hdpi/ic_photosphere_disabled.png Binary files differdeleted file mode 100644 index 64cff4233..000000000 --- a/res_p/drawable-hdpi/ic_photosphere_disabled.png +++ /dev/null diff --git a/res_p/drawable-mdpi/ic_panorama_disabled.png b/res_p/drawable-mdpi/ic_panorama_disabled.png Binary files differdeleted file mode 100644 index ea318a331..000000000 --- a/res_p/drawable-mdpi/ic_panorama_disabled.png +++ /dev/null diff --git a/res_p/drawable-mdpi/ic_photosphere_disabled.png b/res_p/drawable-mdpi/ic_photosphere_disabled.png Binary files differdeleted file mode 100644 index 9278222d9..000000000 --- a/res_p/drawable-mdpi/ic_photosphere_disabled.png +++ /dev/null diff --git a/res_p/drawable-xhdpi/ic_panorama_disabled.png b/res_p/drawable-xhdpi/ic_panorama_disabled.png Binary files differdeleted file mode 100644 index f3a934032..000000000 --- a/res_p/drawable-xhdpi/ic_panorama_disabled.png +++ /dev/null diff --git a/res_p/drawable-xhdpi/ic_photosphere_disabled.png b/res_p/drawable-xhdpi/ic_photosphere_disabled.png Binary files differdeleted file mode 100644 index 63f78399e..000000000 --- a/res_p/drawable-xhdpi/ic_photosphere_disabled.png +++ /dev/null diff --git a/res_p/drawable-xxhdpi/ic_panorama_disabled.png b/res_p/drawable-xxhdpi/ic_panorama_disabled.png Binary files differdeleted file mode 100644 index 09d7a7a7e..000000000 --- a/res_p/drawable-xxhdpi/ic_panorama_disabled.png +++ /dev/null diff --git a/res_p/drawable-xxhdpi/ic_photosphere_disabled.png b/res_p/drawable-xxhdpi/ic_photosphere_disabled.png Binary files differdeleted file mode 100644 index 2c886415d..000000000 --- a/res_p/drawable-xxhdpi/ic_photosphere_disabled.png +++ /dev/null diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 82b0953e7..e1e80d2d9 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -40,9 +40,6 @@ import android.graphics.SurfaceTexture; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.nfc.NfcAdapter; -import android.nfc.NfcAdapter.CreateBeamUrisCallback; -import android.nfc.NfcEvent; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -252,8 +249,6 @@ public class CameraActivity extends QuickActivity private FatalErrorHandler mFatalErrorHandler; private boolean mHasCriticalPermissions; - private final Uri[] mNfcPushUris = new Uri[1]; - private FilmstripContentObserver mLocalImagesObserver; private FilmstripContentObserver mLocalVideosObserver; @@ -848,28 +843,6 @@ public class CameraActivity extends QuickActivity messageId > 0 ? getString(messageId) : ""); } - // Candidate for deletion as Android Beam is deprecated in Android Q - private void setupNfcBeamPush() { - NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mAppContext); - if (adapter == null) { - return; - } - - if (!ApiHelper.HAS_SET_BEAM_PUSH_URIS) { - // Disable beaming - adapter.setNdefPushMessage(null, CameraActivity.this); - return; - } - - adapter.setBeamPushUris(null, CameraActivity.this); - adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() { - @Override - public Uri[] createBeamUris(NfcEvent event) { - return mNfcPushUris; - } - }, CameraActivity.this); - } - @Override public boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent) { int currentIndex = mFilmstripController.getCurrentAdapterIndex(); @@ -1628,9 +1601,6 @@ public class CameraActivity extends QuickActivity preloadFilmstripItems(); - // Candidate for deletion as Android Beam is deprecated in Android Q - setupNfcBeamPush(); - mLocalImagesObserver = new FilmstripContentObserver(); mLocalVideosObserver = new FilmstripContentObserver(); @@ -2879,9 +2849,7 @@ public class CameraActivity extends QuickActivity } private void finishActivityWithIntentResult(int resultCode, Intent resultIntent) { - mResultCodeForTesting = resultCode; - mResultDataForTesting = resultIntent; - setResult(resultCode, resultIntent); + setResultEx(resultCode, resultIntent); finish(); } @@ -2924,15 +2892,6 @@ public class CameraActivity extends QuickActivity return false; } - private void setNfcBeamPushUriFromData(FilmstripItem data) { - final Uri uri = data.getData().getUri(); - if (uri != Uri.EMPTY) { - mNfcPushUris[0] = uri; - } else { - mNfcPushUris[0] = null; - } - } - /** * Updates the visibility of the filmstrip bottom controls and action bar. */ @@ -2955,8 +2914,6 @@ public class CameraActivity extends QuickActivity return; } - setNfcBeamPushUriFromData(currentData); - if (!mDataAdapter.isMetadataUpdatedAt(index)) { mDataAdapter.updateMetadataAt(index); } diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 1068bcf52..32417f60e 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -91,6 +91,9 @@ import com.android.camera2.R; import com.android.ex.camera2.portability.CameraAgent.CameraProxy; import com.google.common.logging.eventprotos; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; @@ -110,7 +113,8 @@ public class CaptureModule extends CameraModule implements OneCamera.PictureCallback, OneCamera.FocusStateListener, OneCamera.ReadyStateChangedListener, - RemoteCameraModule { + RemoteCameraModule, + OneCameraManager.AvailabilityCallback { private static final Tag TAG = new Tag("CaptureModule"); /** Enable additional debug output. */ @@ -168,6 +172,9 @@ public class CaptureModule extends CameraModule implements private OneCameraCharacteristics mCameraCharacteristics; final private PreviewTransformCalculator mPreviewTransformCalculator; + private ScheduledExecutorService mOnCameraAccessService; + private ScheduledFuture mOnCameraAccessFuture; + /** The listener to listen events from the CaptureModuleUI. */ private final CaptureModuleUI.CaptureModuleUIListener mUIListener = new CaptureModuleUI.CaptureModuleUIListener() { @@ -405,12 +412,14 @@ public class CaptureModule extends CameraModule implements thread.start(); mCameraHandler = new Handler(thread.getLooper()); mOneCameraOpener = mAppController.getCameraOpener(); + mOnCameraAccessService = Executors.newSingleThreadScheduledExecutor(); try { mOneCameraManager = OneCameraModule.provideOneCameraManager(); } catch (OneCameraException e) { Log.e(TAG, "Unable to provide a OneCameraManager. ", e); } + mOneCameraManager.setAvailabilityCallback(this, mCameraHandler); mDisplayRotation = CameraUtil.getDisplayRotation(activity); mCameraFacing = getFacingFromCameraId( mSettingsManager.getInteger(mAppController.getModuleScope(), Keys.KEY_CAMERA_ID)); @@ -503,6 +512,27 @@ public class CaptureModule extends CameraModule implements } } + @Override + public void onCameraAccessPrioritiesChanged() { + Log.d(TAG, "onCameraAccessPrioritiesChanged"); + Runnable runnable = () -> { + mMainThread.execute(() -> { + if (!mPaused && mCamera == null && !mAppController.isPaused()) { + openCameraAndStartPreview(); + } + }); + }; + + // onCameraAccessPrioritiesChanged callbacks come in rapid fire due to the way process oom + // scores are updated. To avoid redundantly opening the camera, wait for 300 ms of silence + // before trying on the main thread. + if (mOnCameraAccessFuture != null) { + mOnCameraAccessFuture.cancel(false); + } + mOnCameraAccessFuture = mOnCameraAccessService.schedule(runnable, 300, + TimeUnit.MILLISECONDS); + } + private void decorateSessionAtCaptureTime(CaptureSession session) { String flashSetting = @@ -1393,6 +1423,27 @@ public class CaptureModule extends CameraModule implements } @Override + public void onCameraInUse() { + Log.w(TAG, "Camera in use."); + if (mCamera != null) { + mCamera.close(); + } + mCamera = null; + mCameraOpenCloseLock.release(); + } + + @Override + public void onCameraInterrupted() { + Log.w(TAG, "Camera disconnected during active session."); + AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() { + @Override + public void run() { + closeCamera(); + } + }); + } + + @Override public void onCameraClosed() { mCamera = null; mCameraOpenCloseLock.release(); diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java index bc8d1bcfa..066ac3e11 100644 --- a/src/com/android/camera/Storage.java +++ b/src/com/android/camera/Storage.java @@ -130,7 +130,7 @@ public class Storage { Location location, int orientation, ExifInterface exif, byte[] data, int width, int height, String mimeType) throws IOException { - if (data.length >= 0) { + if (data.length > 0) { Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length); return addImageToMediaStore(resolver, title, date, location, orientation, data.length, bitmap, width, height, mimeType, exif); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index abbae5265..e56e0f772 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -858,7 +858,7 @@ public class VideoModule extends CameraModule intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_STARTED); intentFilter.addDataScheme("file"); mReceiver = new MyBroadcastReceiver(); - mActivity.registerReceiver(mReceiver, intentFilter); + mActivity.registerReceiver(mReceiver, intentFilter, Context.RECEIVER_EXPORTED); } private void setDisplayOrientation() { diff --git a/src/com/android/camera/app/OrientationManagerImpl.java b/src/com/android/camera/app/OrientationManagerImpl.java index c45873611..2209fc47b 100644 --- a/src/com/android/camera/app/OrientationManagerImpl.java +++ b/src/com/android/camera/app/OrientationManagerImpl.java @@ -175,7 +175,7 @@ public class OrientationManagerImpl implements OrientationManager { } private int calculateCurrentScreenOrientation() { - int displayRotation = getDisplayRotation(mActivity); + int displayRotation = CameraUtil.getDisplayRotation(mActivity); // Display rotation >= 180 means we need to use the REVERSE landscape/portrait boolean standard = displayRotation < 180; if (mActivity.getResources().getConfiguration().orientation @@ -251,18 +251,6 @@ public class OrientationManagerImpl implements OrientationManager { return oldDeviceOrientation; } - private static int getDisplayRotation(Activity activity) { - int rotation = activity.getWindowManager().getDefaultDisplay() - .getRotation(); - switch (rotation) { - case Surface.ROTATION_0: return 0; - case Surface.ROTATION_90: return 90; - case Surface.ROTATION_180: return 180; - case Surface.ROTATION_270: return 270; - } - return 0; - } - /** * Calculate the default orientation of the device based on the width and * height of the display when rotation = 0 (i.e. natural width and height) diff --git a/src/com/android/camera/captureintent/state/StateOpeningCamera.java b/src/com/android/camera/captureintent/state/StateOpeningCamera.java index 1b27c6c21..91dc06c24 100644 --- a/src/com/android/camera/captureintent/state/StateOpeningCamera.java +++ b/src/com/android/camera/captureintent/state/StateOpeningCamera.java @@ -78,11 +78,21 @@ public final class StateOpeningCamera extends StateImpl { } @Override + public void onCameraInUse() { + getStateMachine().processEvent(new EventOnOpenCameraFailed()); + } + + @Override public void onCameraClosed() { // Not used anymore. } @Override + public void onCameraInterrupted() { + // Not used. + } + + @Override public void onCameraOpened(@Nonnull final OneCamera camera) { getStateMachine().processEvent(new EventOnOpenCameraSucceeded(camera)); } diff --git a/src/com/android/camera/debug/DebugPropertyHelper.java b/src/com/android/camera/debug/DebugPropertyHelper.java index 66ccaafee..85c0955df 100644 --- a/src/com/android/camera/debug/DebugPropertyHelper.java +++ b/src/com/android/camera/debug/DebugPropertyHelper.java @@ -16,7 +16,7 @@ package com.android.camera.debug; -import com.android.camera.util.SystemProperties; +import android.os.SystemProperties; public class DebugPropertyHelper { private static final String OFF_VALUE = "0"; @@ -38,6 +38,8 @@ public class DebugPropertyHelper { private static final String PROP_WRITE_CAPTURE_DATA = PREFIX + ".capture_write"; /** Is RAW support enabled. */ private static final String PROP_CAPTURE_DNG = PREFIX + ".capture_dng"; + /** Redacting EXIF manufacturer and model name. */ + private static final String PROP_REDACT_EXIF = PREFIX + ".redact_exif"; private static boolean isPropertyOn(String property) { return ON_VALUE.equals(SystemProperties.get(property, OFF_VALUE)); @@ -58,4 +60,8 @@ public class DebugPropertyHelper { public static boolean isCaptureDngEnabled() { return isPropertyOn(PROP_CAPTURE_DNG); } + + public static boolean isRedactExifEnabled() { + return isPropertyOn(PROP_REDACT_EXIF); + } } diff --git a/src/com/android/camera/one/OneCamera.java b/src/com/android/camera/one/OneCamera.java index 07c368945..c56bac48c 100644 --- a/src/com/android/camera/one/OneCamera.java +++ b/src/com/android/camera/one/OneCamera.java @@ -89,10 +89,20 @@ public interface OneCamera { public void onFailure(); /** + * Called if the camera is currently being used by a higher priority application. + **/ + public void onCameraInUse(); + + /** * Called if the camera is closed or disconnected while attempting to * open. */ public void onCameraClosed(); + + /** + * Called if the camera is disconnected after successfully opening + */ + public void onCameraInterrupted(); } /** diff --git a/src/com/android/camera/one/OneCameraManager.java b/src/com/android/camera/one/OneCameraManager.java index d17188c25..26b2e9f69 100644 --- a/src/com/android/camera/one/OneCameraManager.java +++ b/src/com/android/camera/one/OneCameraManager.java @@ -16,6 +16,8 @@ package com.android.camera.one; +import android.os.Handler; + import com.android.camera.device.CameraId; import com.android.camera.one.OneCamera.Facing; @@ -59,6 +61,12 @@ public interface OneCameraManager { public OneCameraCharacteristics getOneCameraCharacteristics(CameraId cameraId) throws OneCameraAccessException; + public void setAvailabilityCallback(AvailabilityCallback callback, Handler handler); + + public interface AvailabilityCallback { + public void onCameraAccessPrioritiesChanged(); + } + public static class Factory { } diff --git a/src/com/android/camera/one/v1/LegacyOneCameraManagerImpl.java b/src/com/android/camera/one/v1/LegacyOneCameraManagerImpl.java index 68f66a18d..a72a27fcf 100644 --- a/src/com/android/camera/one/v1/LegacyOneCameraManagerImpl.java +++ b/src/com/android/camera/one/v1/LegacyOneCameraManagerImpl.java @@ -17,6 +17,7 @@ package com.android.camera.one.v1; import android.hardware.Camera; +import android.os.Handler; import com.android.camera.debug.Log; import com.android.camera.debug.Log.Tag; @@ -160,6 +161,11 @@ public class LegacyOneCameraManagerImpl implements OneCameraManager { return null; } + @Override + public void setAvailabilityCallback(AvailabilityCallback callback, Handler handler) { + // Do nothing + } + public OneCameraCharacteristics computeCameraCharacteristics(CameraId key) throws OneCameraAccessException { OneCameraCharacteristics characteristics; diff --git a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java index d1e0b5b8d..be5ddc93c 100644 --- a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java +++ b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java @@ -22,6 +22,7 @@ import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; import android.os.Build.VERSION_CODES; +import android.os.Handler; import com.android.camera.debug.Log; import com.android.camera.debug.Log.Tag; @@ -42,7 +43,8 @@ import javax.annotation.Nonnull; * Pick camera ids from a list of devices based on defined characteristics. */ @TargetApi(VERSION_CODES.LOLLIPOP) -public class Camera2OneCameraManagerImpl implements OneCameraManager { +public class Camera2OneCameraManagerImpl extends CameraManager.AvailabilityCallback + implements OneCameraManager { private static final Tag TAG = new Tag("Camera2OneCamMgr"); /** * Create a new camera2 api hardware manager. @@ -65,6 +67,7 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager { private final CameraManager mCameraManager; private Hashtable<Facing, String> mCameraFacingCache = new Hashtable<Facing, String>(); + private AvailabilityCallback mAvailabilityCallback; public Camera2OneCameraManagerImpl(CameraManager cameraManger) { mCameraManager = cameraManger; @@ -122,6 +125,12 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager { return new OneCameraCharacteristicsImpl(getCameraCharacteristics(key)); } + @Override + public void setAvailabilityCallback(AvailabilityCallback callback, Handler handler) { + mAvailabilityCallback = callback; + mCameraManager.registerAvailabilityCallback(this, handler); + } + public CameraCharacteristics getCameraCharacteristics( @Nonnull CameraId key) throws OneCameraAccessException { @@ -132,6 +141,13 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager { } } + @Override + public void onCameraAccessPrioritiesChanged() { + if (mAvailabilityCallback != null) { + mAvailabilityCallback.onCameraAccessPrioritiesChanged(); + } + } + /** Returns the ID of the first camera facing the given direction. */ private String findCameraId(Facing facing) { String id = mCameraFacingCache.get(facing); diff --git a/src/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java index 3529310e8..f0a0ce637 100644 --- a/src/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java +++ b/src/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java @@ -131,6 +131,9 @@ public class Camera2OneCameraOpenerImpl implements OneCameraOpener { // then we must call close. device.close(); openCallback.onCameraClosed(); + } else { + // Disconnected during active session + openCallback.onCameraInterrupted(); } } @@ -144,7 +147,12 @@ public class Camera2OneCameraOpenerImpl implements OneCameraOpener { @Override public void onError(CameraDevice device, int error) { - if (isFirstCallback) { + if (error == CameraDevice.StateCallback.ERROR_CAMERA_IN_USE) { + // Tolerate ERROR_CAMERA_IN_USE for split-screen. + isFirstCallback = false; + device.close(); + openCallback.onCameraInUse(); + } else if (isFirstCallback) { isFirstCallback = false; device.close(); openCallback.onFailure(); @@ -197,7 +205,11 @@ public class Camera2OneCameraOpenerImpl implements OneCameraOpener { handler.post(new Runnable() { @Override public void run() { - openCallback.onFailure(); + if (ex.getReason() == CameraAccessException.CAMERA_IN_USE) { + openCallback.onCameraInUse(); + } else { + openCallback.onFailure(); + } } }); } catch (UnsupportedOperationException ex) { diff --git a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java index 7a2caf9fb..50fae1d58 100644 --- a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java +++ b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java @@ -18,6 +18,7 @@ package com.android.camera.processing.imagebackend; import android.graphics.ImageFormat; import android.graphics.Rect; +import android.hardware.Camera; import android.location.Location; import android.media.CameraProfile; import android.net.Uri; @@ -420,7 +421,21 @@ public class TaskCompressImageToJpeg extends TaskJpegEncode { * @return Quality level to use for JPEG compression. */ protected int getJpegCompressionQuality () { - return CameraProfile.getJpegEncodingQualityParameter(CameraProfile.QUALITY_HIGH); + final int quality = CameraProfile.QUALITY_HIGH; + int level = CameraProfile.getJpegEncodingQualityParameter(quality); + + if (level > 0) { + return level; + } + + // getJpegEncodingQualityParameter(int) could not find any back-facing + // cameras. Let's use the first (likely front-facing) camera ID, if any, + // to get the encoding quality. + if (Camera.getNumberOfCameras() > 0) { + return CameraProfile.getJpegEncodingQualityParameter(0, quality); + } + + return 0; } /** diff --git a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java index 7ce574cbc..e4f02b982 100644 --- a/src/com/android/camera/tinyplanet/TinyPlanetFragment.java +++ b/src/com/android/camera/tinyplanet/TinyPlanetFragment.java @@ -112,14 +112,16 @@ public class TinyPlanetFragment extends DialogFragment implements PreviewSizeLis /** Used to delay-post a tiny planet rendering task. */ private final Handler mHandler = new Handler(); + + private final Object mRenderingLock = new Object(); /** Whether rendering is in progress right now. */ - private Boolean mRendering = false; + private boolean mRendering = false; /** * Whether we should render one more time after the current rendering run is * done. This is needed when there was an update to the values during the * current rendering. */ - private Boolean mRenderOneMore = false; + private boolean mRenderOneMore = false; /** Tiny planet data plus size. */ private static final class TinyPlanetImage { @@ -139,7 +141,7 @@ public class TinyPlanetFragment extends DialogFragment implements PreviewSizeLis private final Runnable mCreateTinyPlanetRunnable = new Runnable() { @Override public void run() { - synchronized (mRendering) { + synchronized (mRenderingLock) { if (mRendering) { mRenderOneMore = true; return; @@ -168,7 +170,7 @@ public class TinyPlanetFragment extends DialogFragment implements PreviewSizeLis @Override protected void onPostExecute(Void result) { mPreview.setBitmap(mResultBitmap, mResultLock); - synchronized (mRendering) { + synchronized (mRenderingLock) { mRendering = false; if (mRenderOneMore) { mRenderOneMore = false; @@ -283,7 +285,7 @@ public class TinyPlanetFragment extends DialogFragment implements PreviewSizeLis private void onCreateTinyPlanet() { // Make sure we stop rendering before we create the high-res tiny // planet. - synchronized (mRendering) { + synchronized (mRenderingLock) { mRenderOneMore = false; } diff --git a/src/com/android/camera/util/ExifUtil.java b/src/com/android/camera/util/ExifUtil.java index 18150a0c8..5fae24984 100644 --- a/src/com/android/camera/util/ExifUtil.java +++ b/src/com/android/camera/util/ExifUtil.java @@ -20,6 +20,7 @@ import android.hardware.camera2.CaptureResult; import android.location.Location; import android.os.Build; +import com.android.camera.debug.DebugPropertyHelper; import com.android.camera.exif.ExifInterface; import com.android.camera.exif.Rational; import com.android.camera.one.v2.camera2proxy.CaptureResultProxy; @@ -113,8 +114,13 @@ public class ExifUtil { } private void addMakeAndModelToExif() { - addExifTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); - addExifTag(ExifInterface.TAG_MODEL, Build.MODEL); + if (DebugPropertyHelper.isRedactExifEnabled()) { + addExifTag(ExifInterface.TAG_MAKE, "CAM_YY"); + addExifTag(ExifInterface.TAG_MODEL, "CAM_XX"); + } else { + addExifTag(ExifInterface.TAG_MAKE, Build.MANUFACTURER); + addExifTag(ExifInterface.TAG_MODEL, Build.MODEL); + } } private void addImageDataToExif(TaskImageContainer.TaskImage image) { |
