First part of asset drop

  Bug: 8640131

Added new assets, updated front/back menu entry.

Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53

diff --git a/res/drawable-hdpi/ic_exposure_0.png b/res/drawable-hdpi/ic_exposure_0.png
index d9cfd82..8dae27d 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_0.png and b/res/drawable-hdpi/ic_exposure_0.png differ

diff --git a/res/drawable-hdpi/ic_exposure_holo_light.png b/res/drawable-hdpi/ic_exposure_holo_light.png
index 3c4cc53..8407688 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_holo_light.png and b/res/drawable-hdpi/ic_exposure_holo_light.png differ

diff --git a/res/drawable-hdpi/ic_exposure_n1.png b/res/drawable-hdpi/ic_exposure_n1.png
index 571fadf..c6d4b74 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_n1.png and b/res/drawable-hdpi/ic_exposure_n1.png differ

diff --git a/res/drawable-hdpi/ic_exposure_n2.png b/res/drawable-hdpi/ic_exposure_n2.png
index a12e9fd..3c76545 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_n2.png and b/res/drawable-hdpi/ic_exposure_n2.png differ

diff --git a/res/drawable-hdpi/ic_exposure_n3.png b/res/drawable-hdpi/ic_exposure_n3.png
index d6bd0f3..d0a8127 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_n3.png and b/res/drawable-hdpi/ic_exposure_n3.png differ

diff --git a/res/drawable-hdpi/ic_exposure_p1.png b/res/drawable-hdpi/ic_exposure_p1.png
index 0bd9dc3..9f8e4e3 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_p1.png and b/res/drawable-hdpi/ic_exposure_p1.png differ

diff --git a/res/drawable-hdpi/ic_exposure_p2.png b/res/drawable-hdpi/ic_exposure_p2.png
index b14b50e..4dc4506 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_p2.png and b/res/drawable-hdpi/ic_exposure_p2.png differ

diff --git a/res/drawable-hdpi/ic_exposure_p3.png b/res/drawable-hdpi/ic_exposure_p3.png
index be886cf..66f1b0f 100644 (file)
Binary files a/res/drawable-hdpi/ic_exposure_p3.png and b/res/drawable-hdpi/ic_exposure_p3.png differ

diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light.png b/res/drawable-hdpi/ic_flash_auto_holo_light.png
index 18a260e..26d1f18 100644 (file)
Binary files a/res/drawable-hdpi/ic_flash_auto_holo_light.png and b/res/drawable-hdpi/ic_flash_auto_holo_light.png differ

diff --git a/res/drawable-hdpi/ic_flash_off_holo_light.png b/res/drawable-hdpi/ic_flash_off_holo_light.png
index fc1287c..0c84ab6 100644 (file)
Binary files a/res/drawable-hdpi/ic_flash_off_holo_light.png and b/res/drawable-hdpi/ic_flash_off_holo_light.png differ

diff --git a/res/drawable-hdpi/ic_flash_on_holo_light.png b/res/drawable-hdpi/ic_flash_on_holo_light.png
index bad32ef..7e08abf 100644 (file)
Binary files a/res/drawable-hdpi/ic_flash_on_holo_light.png and b/res/drawable-hdpi/ic_flash_on_holo_light.png differ

diff --git a/res/drawable-hdpi/ic_flash_torch.png b/res/drawable-hdpi/ic_flash_torch.png
index 59a7a22..53afdd5 100644 (file)
Binary files a/res/drawable-hdpi/ic_flash_torch.png and b/res/drawable-hdpi/ic_flash_torch.png differ

diff --git a/res/drawable-hdpi/ic_hdr.png b/res/drawable-hdpi/ic_hdr.png
index 5d174f7..66c86d5 100644 (file)
Binary files a/res/drawable-hdpi/ic_hdr.png and b/res/drawable-hdpi/ic_hdr.png differ

diff --git a/res/drawable-hdpi/ic_hdr_off.png b/res/drawable-hdpi/ic_hdr_off.png
new file mode 100644 (file)
index 0000000..32e6ceb
Binary files /dev/null and b/res/drawable-hdpi/ic_hdr_off.png differ

diff --git a/res/drawable-hdpi/ic_location.png b/res/drawable-hdpi/ic_location.png
new file mode 100644 (file)
index 0000000..acca3ff
Binary files /dev/null and b/res/drawable-hdpi/ic_location.png differ

diff --git a/res/drawable-hdpi/ic_location_off.png b/res/drawable-hdpi/ic_location_off.png
new file mode 100644 (file)
index 0000000..803a881
Binary files /dev/null and b/res/drawable-hdpi/ic_location_off.png differ

diff --git a/res/drawable-hdpi/ic_sce.png b/res/drawable-hdpi/ic_sce.png
new file mode 100644 (file)
index 0000000..0c8d25f
Binary files /dev/null and b/res/drawable-hdpi/ic_sce.png differ

diff --git a/res/drawable-hdpi/ic_sce_action.png b/res/drawable-hdpi/ic_sce_action.png
new file mode 100644 (file)
index 0000000..3e91a5a
Binary files /dev/null and b/res/drawable-hdpi/ic_sce_action.png differ

diff --git a/res/drawable-hdpi/ic_sce_night.png b/res/drawable-hdpi/ic_sce_night.png
new file mode 100644 (file)
index 0000000..10cc0b8
Binary files /dev/null and b/res/drawable-hdpi/ic_sce_night.png differ

diff --git a/res/drawable-hdpi/ic_sce_party.png b/res/drawable-hdpi/ic_sce_party.png
new file mode 100644 (file)
index 0000000..ba4929a
Binary files /dev/null and b/res/drawable-hdpi/ic_sce_party.png differ

diff --git a/res/drawable-hdpi/ic_sce_sunset.png b/res/drawable-hdpi/ic_sce_sunset.png
new file mode 100644 (file)
index 0000000..cf353af
Binary files /dev/null and b/res/drawable-hdpi/ic_sce_sunset.png differ

diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png
index 82f6e81..4441fde 100644 (file)
Binary files a/res/drawable-hdpi/ic_settings_holo_light.png and b/res/drawable-hdpi/ic_settings_holo_light.png differ

diff --git a/res/drawable-hdpi/ic_switch_back.png b/res/drawable-hdpi/ic_switch_back.png
new file mode 100644 (file)
index 0000000..8f94b67
Binary files /dev/null and b/res/drawable-hdpi/ic_switch_back.png differ

diff --git a/res/drawable-hdpi/ic_switch_front.png b/res/drawable-hdpi/ic_switch_front.png
new file mode 100644 (file)
index 0000000..112752e
Binary files /dev/null and b/res/drawable-hdpi/ic_switch_front.png differ

diff --git a/res/drawable-hdpi/ic_timer_10s.png b/res/drawable-hdpi/ic_timer_10s.png
new file mode 100644 (file)
index 0000000..e63ce97
Binary files /dev/null and b/res/drawable-hdpi/ic_timer_10s.png differ

diff --git a/res/drawable-hdpi/ic_timer_15s.png b/res/drawable-hdpi/ic_timer_15s.png
new file mode 100644 (file)
index 0000000..01fae05
Binary files /dev/null and b/res/drawable-hdpi/ic_timer_15s.png differ

diff --git a/res/drawable-hdpi/ic_timer_1s.png b/res/drawable-hdpi/ic_timer_1s.png
new file mode 100644 (file)
index 0000000..05804d2
Binary files /dev/null and b/res/drawable-hdpi/ic_timer_1s.png differ

diff --git a/res/drawable-hdpi/ic_timer_3s.png b/res/drawable-hdpi/ic_timer_3s.png
new file mode 100644 (file)
index 0000000..23ca121
Binary files /dev/null and b/res/drawable-hdpi/ic_timer_3s.png differ

diff --git a/res/drawable-hdpi/ic_timer_off.png b/res/drawable-hdpi/ic_timer_off.png
new file mode 100644 (file)
index 0000000..a79c5b8
Binary files /dev/null and b/res/drawable-hdpi/ic_timer_off.png differ

diff --git a/res/drawable-hdpi/ic_wb_auto.png b/res/drawable-hdpi/ic_wb_auto.png
index dd541b1..7e5f71c 100644 (file)
Binary files a/res/drawable-hdpi/ic_wb_auto.png and b/res/drawable-hdpi/ic_wb_auto.png differ

diff --git a/res/drawable-hdpi/ic_wb_cloudy.png b/res/drawable-hdpi/ic_wb_cloudy.png
index 1b74537..b53cf9e 100644 (file)
Binary files a/res/drawable-hdpi/ic_wb_cloudy.png and b/res/drawable-hdpi/ic_wb_cloudy.png differ

diff --git a/res/drawable-hdpi/ic_wb_fluorescent.png b/res/drawable-hdpi/ic_wb_fluorescent.png
index d7a1580..cd46de6 100644 (file)
Binary files a/res/drawable-hdpi/ic_wb_fluorescent.png and b/res/drawable-hdpi/ic_wb_fluorescent.png differ

diff --git a/res/drawable-hdpi/ic_wb_incandescent.png b/res/drawable-hdpi/ic_wb_incandescent.png
index 7e8dbd3..1237bf1 100644 (file)
Binary files a/res/drawable-hdpi/ic_wb_incandescent.png and b/res/drawable-hdpi/ic_wb_incandescent.png differ

diff --git a/res/drawable-hdpi/ic_wb_sunlight.png b/res/drawable-hdpi/ic_wb_sunlight.png
index 3901126..514f576 100644 (file)
Binary files a/res/drawable-hdpi/ic_wb_sunlight.png and b/res/drawable-hdpi/ic_wb_sunlight.png differ

diff --git a/res/drawable-mdpi/ic_exposure_0.png b/res/drawable-mdpi/ic_exposure_0.png
index 314aa9d..7396692 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_0.png and b/res/drawable-mdpi/ic_exposure_0.png differ

diff --git a/res/drawable-mdpi/ic_exposure_holo_light.png b/res/drawable-mdpi/ic_exposure_holo_light.png
index 96f71d8..d5844ee 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_holo_light.png and b/res/drawable-mdpi/ic_exposure_holo_light.png differ

diff --git a/res/drawable-mdpi/ic_exposure_n1.png b/res/drawable-mdpi/ic_exposure_n1.png
index ab4b4fb..6704986 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_n1.png and b/res/drawable-mdpi/ic_exposure_n1.png differ

diff --git a/res/drawable-mdpi/ic_exposure_n2.png b/res/drawable-mdpi/ic_exposure_n2.png
index 69e83be..59feb88 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_n2.png and b/res/drawable-mdpi/ic_exposure_n2.png differ

diff --git a/res/drawable-mdpi/ic_exposure_n3.png b/res/drawable-mdpi/ic_exposure_n3.png
index 4511f76..aa1cf26 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_n3.png and b/res/drawable-mdpi/ic_exposure_n3.png differ

diff --git a/res/drawable-mdpi/ic_exposure_p1.png b/res/drawable-mdpi/ic_exposure_p1.png
index 68f22bb..2286fc2 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_p1.png and b/res/drawable-mdpi/ic_exposure_p1.png differ

diff --git a/res/drawable-mdpi/ic_exposure_p2.png b/res/drawable-mdpi/ic_exposure_p2.png
index 2aeedb6..00b6103 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_p2.png and b/res/drawable-mdpi/ic_exposure_p2.png differ

diff --git a/res/drawable-mdpi/ic_exposure_p3.png b/res/drawable-mdpi/ic_exposure_p3.png
index c4300eb..52688c9 100644 (file)
Binary files a/res/drawable-mdpi/ic_exposure_p3.png and b/res/drawable-mdpi/ic_exposure_p3.png differ

diff --git a/res/drawable-mdpi/ic_flash_auto_holo_light.png b/res/drawable-mdpi/ic_flash_auto_holo_light.png
index 0537e56..a1fbac9 100644 (file)
Binary files a/res/drawable-mdpi/ic_flash_auto_holo_light.png and b/res/drawable-mdpi/ic_flash_auto_holo_light.png differ

diff --git a/res/drawable-mdpi/ic_flash_off_holo_light.png b/res/drawable-mdpi/ic_flash_off_holo_light.png
index 582bb0c..fe7dc01 100644 (file)
Binary files a/res/drawable-mdpi/ic_flash_off_holo_light.png and b/res/drawable-mdpi/ic_flash_off_holo_light.png differ

diff --git a/res/drawable-mdpi/ic_flash_on_holo_light.png b/res/drawable-mdpi/ic_flash_on_holo_light.png
index 9e798be..3ad34f6 100644 (file)
Binary files a/res/drawable-mdpi/ic_flash_on_holo_light.png and b/res/drawable-mdpi/ic_flash_on_holo_light.png differ

diff --git a/res/drawable-mdpi/ic_flash_torch.png b/res/drawable-mdpi/ic_flash_torch.png
index 89eaa32..0a1ba8c 100644 (file)
Binary files a/res/drawable-mdpi/ic_flash_torch.png and b/res/drawable-mdpi/ic_flash_torch.png differ

diff --git a/res/drawable-mdpi/ic_hdr.png b/res/drawable-mdpi/ic_hdr.png
index b974ecb..7e39560 100644 (file)
Binary files a/res/drawable-mdpi/ic_hdr.png and b/res/drawable-mdpi/ic_hdr.png differ

diff --git a/res/drawable-mdpi/ic_hdr_off.png b/res/drawable-mdpi/ic_hdr_off.png
new file mode 100644 (file)
index 0000000..d3f3835
Binary files /dev/null and b/res/drawable-mdpi/ic_hdr_off.png differ

diff --git a/res/drawable-mdpi/ic_location.png b/res/drawable-mdpi/ic_location.png
new file mode 100644 (file)
index 0000000..d50414d
Binary files /dev/null and b/res/drawable-mdpi/ic_location.png differ

diff --git a/res/drawable-mdpi/ic_location_off.png b/res/drawable-mdpi/ic_location_off.png
new file mode 100644 (file)
index 0000000..b1a22ab
Binary files /dev/null and b/res/drawable-mdpi/ic_location_off.png differ

diff --git a/res/drawable-mdpi/ic_sce.png b/res/drawable-mdpi/ic_sce.png
new file mode 100644 (file)
index 0000000..851db21
Binary files /dev/null and b/res/drawable-mdpi/ic_sce.png differ

diff --git a/res/drawable-mdpi/ic_sce_action.png b/res/drawable-mdpi/ic_sce_action.png
new file mode 100644 (file)
index 0000000..24762d0
Binary files /dev/null and b/res/drawable-mdpi/ic_sce_action.png differ

diff --git a/res/drawable-mdpi/ic_sce_night.png b/res/drawable-mdpi/ic_sce_night.png
new file mode 100644 (file)
index 0000000..6c7e245
Binary files /dev/null and b/res/drawable-mdpi/ic_sce_night.png differ

diff --git a/res/drawable-mdpi/ic_sce_party.png b/res/drawable-mdpi/ic_sce_party.png
new file mode 100644 (file)
index 0000000..4505fd3
Binary files /dev/null and b/res/drawable-mdpi/ic_sce_party.png differ

diff --git a/res/drawable-mdpi/ic_sce_sunset.png b/res/drawable-mdpi/ic_sce_sunset.png
new file mode 100644 (file)
index 0000000..0dc553f
Binary files /dev/null and b/res/drawable-mdpi/ic_sce_sunset.png differ

diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png
index 4d3e90b..8aa3991 100644 (file)
Binary files a/res/drawable-mdpi/ic_settings_holo_light.png and b/res/drawable-mdpi/ic_settings_holo_light.png differ

diff --git a/res/drawable-mdpi/ic_switch_back.png b/res/drawable-mdpi/ic_switch_back.png
new file mode 100644 (file)
index 0000000..5042781
Binary files /dev/null and b/res/drawable-mdpi/ic_switch_back.png differ

diff --git a/res/drawable-mdpi/ic_switch_front.png b/res/drawable-mdpi/ic_switch_front.png
new file mode 100644 (file)
index 0000000..5212fcb
Binary files /dev/null and b/res/drawable-mdpi/ic_switch_front.png differ

diff --git a/res/drawable-mdpi/ic_timer_10s.png b/res/drawable-mdpi/ic_timer_10s.png
new file mode 100644 (file)
index 0000000..fa92fc5
Binary files /dev/null and b/res/drawable-mdpi/ic_timer_10s.png differ

diff --git a/res/drawable-mdpi/ic_timer_15s.png b/res/drawable-mdpi/ic_timer_15s.png
new file mode 100644 (file)
index 0000000..68c9f33
Binary files /dev/null and b/res/drawable-mdpi/ic_timer_15s.png differ

diff --git a/res/drawable-mdpi/ic_timer_1s.png b/res/drawable-mdpi/ic_timer_1s.png
new file mode 100644 (file)
index 0000000..323811f
Binary files /dev/null and b/res/drawable-mdpi/ic_timer_1s.png differ

diff --git a/res/drawable-mdpi/ic_timer_3s.png b/res/drawable-mdpi/ic_timer_3s.png
new file mode 100644 (file)
index 0000000..b648caf
Binary files /dev/null and b/res/drawable-mdpi/ic_timer_3s.png differ

diff --git a/res/drawable-mdpi/ic_timer_off.png b/res/drawable-mdpi/ic_timer_off.png
new file mode 100644 (file)
index 0000000..2754479
Binary files /dev/null and b/res/drawable-mdpi/ic_timer_off.png differ

diff --git a/res/drawable-mdpi/ic_wb_auto.png b/res/drawable-mdpi/ic_wb_auto.png
index 1ea804b..49b115f 100644 (file)
Binary files a/res/drawable-mdpi/ic_wb_auto.png and b/res/drawable-mdpi/ic_wb_auto.png differ

diff --git a/res/drawable-mdpi/ic_wb_cloudy.png b/res/drawable-mdpi/ic_wb_cloudy.png
index 60fe235..8eff219 100644 (file)
Binary files a/res/drawable-mdpi/ic_wb_cloudy.png and b/res/drawable-mdpi/ic_wb_cloudy.png differ

diff --git a/res/drawable-mdpi/ic_wb_fluorescent.png b/res/drawable-mdpi/ic_wb_fluorescent.png
index ba1bb83..4c95bde 100644 (file)
Binary files a/res/drawable-mdpi/ic_wb_fluorescent.png and b/res/drawable-mdpi/ic_wb_fluorescent.png differ

diff --git a/res/drawable-mdpi/ic_wb_incandescent.png b/res/drawable-mdpi/ic_wb_incandescent.png
index 3f3fb83..fd8b2bd 100644 (file)
Binary files a/res/drawable-mdpi/ic_wb_incandescent.png and b/res/drawable-mdpi/ic_wb_incandescent.png differ

diff --git a/res/drawable-mdpi/ic_wb_sunlight.png b/res/drawable-mdpi/ic_wb_sunlight.png
index b838cb8..0e36c61 100644 (file)
Binary files a/res/drawable-mdpi/ic_wb_sunlight.png and b/res/drawable-mdpi/ic_wb_sunlight.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_0.png b/res/drawable-xhdpi/ic_exposure_0.png
index 52087dd..3469e31 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_0.png and b/res/drawable-xhdpi/ic_exposure_0.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_holo_light.png b/res/drawable-xhdpi/ic_exposure_holo_light.png
index 14206fd..0c1a404 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_holo_light.png and b/res/drawable-xhdpi/ic_exposure_holo_light.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_n1.png b/res/drawable-xhdpi/ic_exposure_n1.png
index 2280506..7a28631 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_n1.png and b/res/drawable-xhdpi/ic_exposure_n1.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_n2.png b/res/drawable-xhdpi/ic_exposure_n2.png
index 4071572..fb271e5 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_n2.png and b/res/drawable-xhdpi/ic_exposure_n2.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_n3.png b/res/drawable-xhdpi/ic_exposure_n3.png
index fa4d6d9..70943ce 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_n3.png and b/res/drawable-xhdpi/ic_exposure_n3.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_p1.png b/res/drawable-xhdpi/ic_exposure_p1.png
index 82c5461..58eb901 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_p1.png and b/res/drawable-xhdpi/ic_exposure_p1.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_p2.png b/res/drawable-xhdpi/ic_exposure_p2.png
index c742847..0ba7a65 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_p2.png and b/res/drawable-xhdpi/ic_exposure_p2.png differ

diff --git a/res/drawable-xhdpi/ic_exposure_p3.png b/res/drawable-xhdpi/ic_exposure_p3.png
index a573d6b..f5f352e 100644 (file)
Binary files a/res/drawable-xhdpi/ic_exposure_p3.png and b/res/drawable-xhdpi/ic_exposure_p3.png differ

diff --git a/res/drawable-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-xhdpi/ic_flash_auto_holo_light.png
index a9ab5d7..f2e97b8 100644 (file)
Binary files a/res/drawable-xhdpi/ic_flash_auto_holo_light.png and b/res/drawable-xhdpi/ic_flash_auto_holo_light.png differ

diff --git a/res/drawable-xhdpi/ic_flash_off_holo_light.png b/res/drawable-xhdpi/ic_flash_off_holo_light.png
index 76c5219..8fc7352 100644 (file)
Binary files a/res/drawable-xhdpi/ic_flash_off_holo_light.png and b/res/drawable-xhdpi/ic_flash_off_holo_light.png differ

diff --git a/res/drawable-xhdpi/ic_flash_on_holo_light.png b/res/drawable-xhdpi/ic_flash_on_holo_light.png
index d72b1b5..1013800 100644 (file)
Binary files a/res/drawable-xhdpi/ic_flash_on_holo_light.png and b/res/drawable-xhdpi/ic_flash_on_holo_light.png differ

diff --git a/res/drawable-xhdpi/ic_flash_torch.png b/res/drawable-xhdpi/ic_flash_torch.png
index aa6e2c9..b5bcc4d 100644 (file)
Binary files a/res/drawable-xhdpi/ic_flash_torch.png and b/res/drawable-xhdpi/ic_flash_torch.png differ

diff --git a/res/drawable-xhdpi/ic_hdr.png b/res/drawable-xhdpi/ic_hdr.png
index 534c7b3..fa5fc60 100644 (file)
Binary files a/res/drawable-xhdpi/ic_hdr.png and b/res/drawable-xhdpi/ic_hdr.png differ

diff --git a/res/drawable-xhdpi/ic_hdr_off.png b/res/drawable-xhdpi/ic_hdr_off.png
new file mode 100644 (file)
index 0000000..1aa2e87
Binary files /dev/null and b/res/drawable-xhdpi/ic_hdr_off.png differ

diff --git a/res/drawable-xhdpi/ic_location.png b/res/drawable-xhdpi/ic_location.png
new file mode 100644 (file)
index 0000000..7144f01
Binary files /dev/null and b/res/drawable-xhdpi/ic_location.png differ

diff --git a/res/drawable-xhdpi/ic_location_off.png b/res/drawable-xhdpi/ic_location_off.png
new file mode 100644 (file)
index 0000000..343505b
Binary files /dev/null and b/res/drawable-xhdpi/ic_location_off.png differ

diff --git a/res/drawable-xhdpi/ic_sce.png b/res/drawable-xhdpi/ic_sce.png
new file mode 100644 (file)
index 0000000..3e7820a
Binary files /dev/null and b/res/drawable-xhdpi/ic_sce.png differ

diff --git a/res/drawable-xhdpi/ic_sce_action.png b/res/drawable-xhdpi/ic_sce_action.png
new file mode 100644 (file)
index 0000000..6cd4f24
Binary files /dev/null and b/res/drawable-xhdpi/ic_sce_action.png differ

diff --git a/res/drawable-xhdpi/ic_sce_night.png b/res/drawable-xhdpi/ic_sce_night.png
new file mode 100644 (file)
index 0000000..258d2ba
Binary files /dev/null and b/res/drawable-xhdpi/ic_sce_night.png differ

diff --git a/res/drawable-xhdpi/ic_sce_party.png b/res/drawable-xhdpi/ic_sce_party.png
new file mode 100644 (file)
index 0000000..bb78bbb
Binary files /dev/null and b/res/drawable-xhdpi/ic_sce_party.png differ

diff --git a/res/drawable-xhdpi/ic_sce_sunset.png b/res/drawable-xhdpi/ic_sce_sunset.png
new file mode 100644 (file)
index 0000000..1eeaee1
Binary files /dev/null and b/res/drawable-xhdpi/ic_sce_sunset.png differ

diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png
index a6a2264..0b65b0e 100644 (file)
Binary files a/res/drawable-xhdpi/ic_settings_holo_light.png and b/res/drawable-xhdpi/ic_settings_holo_light.png differ

diff --git a/res/drawable-xhdpi/ic_switch_back.png b/res/drawable-xhdpi/ic_switch_back.png
new file mode 100644 (file)
index 0000000..8d81411
Binary files /dev/null and b/res/drawable-xhdpi/ic_switch_back.png differ

diff --git a/res/drawable-xhdpi/ic_switch_front.png b/res/drawable-xhdpi/ic_switch_front.png
new file mode 100644 (file)
index 0000000..52d0b25
Binary files /dev/null and b/res/drawable-xhdpi/ic_switch_front.png differ

diff --git a/res/drawable-xhdpi/ic_timer_10s.png b/res/drawable-xhdpi/ic_timer_10s.png
new file mode 100644 (file)
index 0000000..a50da30
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_10s.png differ

diff --git a/res/drawable-xhdpi/ic_timer_15s.png b/res/drawable-xhdpi/ic_timer_15s.png
new file mode 100644 (file)
index 0000000..29f8675
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_15s.png differ

diff --git a/res/drawable-xhdpi/ic_timer_1s.png b/res/drawable-xhdpi/ic_timer_1s.png
new file mode 100644 (file)
index 0000000..b1fb944
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_1s.png differ

diff --git a/res/drawable-xhdpi/ic_timer_3s.png b/res/drawable-xhdpi/ic_timer_3s.png
new file mode 100644 (file)
index 0000000..a0b7c5a
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_3s.png differ

diff --git a/res/drawable-xhdpi/ic_timer_off.png b/res/drawable-xhdpi/ic_timer_off.png
new file mode 100644 (file)
index 0000000..c0a528e
Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_off.png differ

diff --git a/res/drawable-xhdpi/ic_wb_auto.png b/res/drawable-xhdpi/ic_wb_auto.png
index f465413..3dabecc 100644 (file)
Binary files a/res/drawable-xhdpi/ic_wb_auto.png and b/res/drawable-xhdpi/ic_wb_auto.png differ

diff --git a/res/drawable-xhdpi/ic_wb_cloudy.png b/res/drawable-xhdpi/ic_wb_cloudy.png
index 9c3b84f..3a36407 100644 (file)
Binary files a/res/drawable-xhdpi/ic_wb_cloudy.png and b/res/drawable-xhdpi/ic_wb_cloudy.png differ

diff --git a/res/drawable-xhdpi/ic_wb_fluorescent.png b/res/drawable-xhdpi/ic_wb_fluorescent.png
index 4005bc7..908df81 100644 (file)
Binary files a/res/drawable-xhdpi/ic_wb_fluorescent.png and b/res/drawable-xhdpi/ic_wb_fluorescent.png differ

diff --git a/res/drawable-xhdpi/ic_wb_incandescent.png b/res/drawable-xhdpi/ic_wb_incandescent.png
index c23477f..5447f00 100644 (file)
Binary files a/res/drawable-xhdpi/ic_wb_incandescent.png and b/res/drawable-xhdpi/ic_wb_incandescent.png differ

diff --git a/res/drawable-xhdpi/ic_wb_sunlight.png b/res/drawable-xhdpi/ic_wb_sunlight.png
index 1a821be..cc3d29f 100644 (file)
Binary files a/res/drawable-xhdpi/ic_wb_sunlight.png and b/res/drawable-xhdpi/ic_wb_sunlight.png differ

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 57da3cb..992db8e 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -347,13 +347,13 @@
     </array>
 
     <array name="camera_id_icons" translatable="false">
-        <item>@drawable/ic_menuselect_camera_facing_back</item>
-        <item>@drawable/ic_menuselect_camera_facing_front</item>
+        <item>@drawable/ic_switch_back</item>
+        <item>@drawable/ic_switch_front</item>
     </array>
 
     <array name="camera_id_largeicons" translatable="false">
-        <item>@drawable/ic_viewfinder_camera_facing_back</item>
-        <item>@drawable/ic_viewfinder_camera_facing_front</item>
+        <item>@drawable/ic_switch_back</item>
+        <item>@drawable/ic_switch_front</item>
     </array>
 
     <string-array name="pref_video_effect_entries" translatable="false">

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 09c96b2..77f2fc5 100644 (file)
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -81,9 +81,13 @@ public class PhotoMenu extends PieController
         }
         // camera switcher
         if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
-            item = makeItem(R.drawable.ic_switch_photo_facing_holo_light);
-            ListPreference lpref = group.findPreference(CameraSettings.KEY_CAMERA_ID);
-            item.setPosition(POS_SWITCH, 5);
+            item = makeItem(R.drawable.ic_switch_back);
+            item.setPosition(POS_SWITCH,  5);
+            IconListPreference lpref = (IconListPreference) group.findPreference(
+                    CameraSettings.KEY_CAMERA_ID);
+            item.setImageResource(mActivity,
+                    ((IconListPreference) lpref).getIconIds()
+                    [lpref.findIndexOfValue(lpref.getValue())]);
             item.setLabel(lpref.getLabel());
             final PieItem fitem = item;
             item.setOnClickListener(new OnClickListener() {
@@ -99,6 +103,8 @@ public class PhotoMenu extends PieController
                         int newCameraId = Integer
                                 .parseInt((String) values[index]);
                         fitem.setLabel(camPref.getLabel());
+                        fitem.setImageResource(mActivity,
+                                ((IconListPreference) camPref).getIconIds()[index]);
                         mListener.onCameraPickerClicked(newCameraId);
                     }
                 }

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 431483f..ca2549e 100644 (file)
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -34,10 +34,10 @@ public class VideoMenu extends PieController
         TimeIntervalPopup.Listener {
 
     private static String TAG = "CAM_VideoMenu";
-    private static final int POS_WB = 1;
-    private static final int POS_SET = 2;
+    private static final int POS_WB = 0;
+    private static final int POS_SET = 1;
     private static final int POS_FLASH = 3;
-    private static final int POS_SWITCH = 4;
+    private static final int POS_SWITCH = 2;
 
     private VideoUI mUI;
     private String[] mOtherKeys;
@@ -72,10 +72,15 @@ public class VideoMenu extends PieController
         }
         // camera switcher
         if (group.findPreference(CameraSettings.KEY_CAMERA_ID) != null) {
-            ListPreference lpref = group.findPreference(CameraSettings.KEY_CAMERA_ID);
-            item = makeItem(R.drawable.ic_switch_video_facing_holo_light);
+            item = makeItem(R.drawable.ic_switch_back);
             item.setPosition(POS_SWITCH, 5);
+            IconListPreference lpref = (IconListPreference) group.findPreference(
+                    CameraSettings.KEY_CAMERA_ID);
             item.setLabel(lpref.getLabel());
+            item.setImageResource(mActivity,
+                    ((IconListPreference) lpref).getIconIds()
+                    [lpref.findIndexOfValue(lpref.getValue())]);
+
             final PieItem fitem = item;
             item.setOnClickListener(new OnClickListener() {
 
@@ -89,8 +94,10 @@ public class VideoMenu extends PieController
                         CharSequence[] values = pref.getEntryValues();
                         index = (index + 1) % values.length;
                         int newCameraId = Integer.parseInt((String) values[index]);
-                        mListener.onCameraPickerClicked(newCameraId);
+                        fitem.setImageResource(mActivity,
+                                ((IconListPreference) pref).getIconIds()[index]);
                         fitem.setLabel(pref.getLabel());
+                        mListener.onCameraPickerClicked(newCameraId);
                     }
                 }
             });