summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-04-26 11:09:29 -0700
committerMichael Kolb <kolby@google.com>2013-04-26 15:47:00 -0700
commit81dc4d290692f050dd40066e0d2f329ecfb0e460 (patch)
treedb95a1e6fd6ee20980c9e57b1288f5fb877b8e40
parent877482335f89da699d0c986e585e489dc7f2d7d9 (diff)
downloadandroid_packages_apps_Snap-81dc4d290692f050dd40066e0d2f329ecfb0e460.tar.gz
android_packages_apps_Snap-81dc4d290692f050dd40066e0d2f329ecfb0e460.tar.bz2
android_packages_apps_Snap-81dc4d290692f050dd40066e0d2f329ecfb0e460.zip
Add new indicators
Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
-rw-r--r--res/drawable-hdpi/ic_exposure_0.pngbin1521 -> 1570 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_holo_light.pngbin4010 -> 4074 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_n1.pngbin1427 -> 1425 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_n2.pngbin2182 -> 2228 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_n3.pngbin2297 -> 2367 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_p1.pngbin1805 -> 1798 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_p2.pngbin2496 -> 2497 bytes
-rw-r--r--res/drawable-hdpi/ic_exposure_p3.pngbin2583 -> 2627 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_auto_holo_light.pngbin3413 -> 3523 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_off_holo_light.pngbin3283 -> 3444 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_on_holo_light.pngbin2513 -> 2584 bytes
-rw-r--r--res/drawable-hdpi/ic_flash_torch.pngbin4477 -> 4606 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr.pngbin2838 -> 2889 bytes
-rw-r--r--res/drawable-hdpi/ic_hdr_off.pngbin4020 -> 4078 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_0.pngbin2330 -> 1461 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_n1.pngbin2560 -> 1664 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_n2.pngbin3132 -> 2216 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_n3.pngbin3230 -> 2421 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_p1.pngbin2885 -> 1914 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_p2.pngbin3511 -> 2441 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_ev_p3.pngbin3604 -> 2607 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_flash_auto.pngbin3748 -> 2648 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_flash_off.pngbin2400 -> 1581 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_flash_on.pngbin3007 -> 2153 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_loc_off.pngbin0 -> 2733 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_loc_on.pngbin0 -> 1833 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_hdr.pngbin0 -> 2133 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_off.pngbin2345 -> 1415 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_sce_on.pngbin3338 -> 2565 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_timer_off.pngbin0 -> 1849 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_timer_on.pngbin0 -> 2406 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_wb_cloudy.pngbin0 -> 1758 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_wb_daylight.pngbin0 -> 2904 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_wb_fluorescent.pngbin0 -> 2387 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_wb_off.pngbin0 -> 1582 bytes
-rw-r--r--res/drawable-hdpi/ic_indicator_wb_tungsten.pngbin0 -> 2118 bytes
-rw-r--r--res/drawable-hdpi/ic_location.pngbin2632 -> 2682 bytes
-rw-r--r--res/drawable-hdpi/ic_location_off.pngbin3309 -> 3370 bytes
-rw-r--r--res/drawable-hdpi/ic_sce.pngbin3242 -> 3237 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_action.pngbin4373 -> 4450 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_night.pngbin3413 -> 3497 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_off.pngbin0 -> 4202 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_party.pngbin4291 -> 4481 bytes
-rw-r--r--res/drawable-hdpi/ic_sce_sunset.pngbin3247 -> 3286 bytes
-rw-r--r--res/drawable-hdpi/ic_settings_holo_light.pngbin3052 -> 3187 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_back.pngbin3478 -> 3490 bytes
-rw-r--r--res/drawable-hdpi/ic_switch_front.pngbin3957 -> 3962 bytes
-rw-r--r--res/drawable-hdpi/ic_timer_10s.pngbin4406 -> 4456 bytes
-rw-r--r--res/drawable-hdpi/ic_timer_15s.pngbin4632 -> 4643 bytes
-rw-r--r--res/drawable-hdpi/ic_timer_1s.pngbin3942 -> 4015 bytes
-rw-r--r--res/drawable-hdpi/ic_timer_3s.pngbin4105 -> 4204 bytes
-rw-r--r--res/drawable-hdpi/ic_timer_off.pngbin3634 -> 3755 bytes
-rw-r--r--res/drawable-hdpi/ic_wb_auto.pngbin3472 -> 3487 bytes
-rw-r--r--res/drawable-hdpi/ic_wb_cloudy.pngbin2075 -> 2117 bytes
-rw-r--r--res/drawable-hdpi/ic_wb_fluorescent.pngbin3520 -> 3614 bytes
-rw-r--r--res/drawable-hdpi/ic_wb_incandescent.pngbin2999 -> 3023 bytes
-rw-r--r--res/drawable-hdpi/ic_wb_sunlight.pngbin4314 -> 4346 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_0.pngbin1110 -> 1087 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_holo_light.pngbin2476 -> 2484 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_n1.pngbin1116 -> 1136 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_n2.pngbin1498 -> 1509 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_n3.pngbin1504 -> 1504 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_p1.pngbin1291 -> 1318 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_p2.pngbin1602 -> 1637 bytes
-rw-r--r--res/drawable-mdpi/ic_exposure_p3.pngbin1651 -> 1678 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_auto_holo_light.pngbin2168 -> 2186 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_off_holo_light.pngbin2118 -> 2131 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_on_holo_light.pngbin1658 -> 1688 bytes
-rw-r--r--res/drawable-mdpi/ic_flash_torch.pngbin2775 -> 2795 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr.pngbin1899 -> 1935 bytes
-rw-r--r--res/drawable-mdpi/ic_hdr_off.pngbin2532 -> 2566 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_0.pngbin1495 -> 981 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_n1.pngbin1693 -> 1221 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_n2.pngbin2020 -> 1473 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_n3.pngbin2059 -> 1508 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_p1.pngbin1945 -> 1339 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_p2.pngbin2232 -> 1552 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_ev_p3.pngbin2287 -> 1600 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_flash_auto.pngbin2393 -> 1711 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_flash_off.pngbin1554 -> 1023 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_flash_on.pngbin1964 -> 1433 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_loc_off.pngbin0 -> 1757 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_loc_on.pngbin0 -> 1197 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_hdr.pngbin0 -> 1422 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_off.pngbin1523 -> 965 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_sce_on.pngbin2245 -> 1651 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_timer_off.pngbin0 -> 1201 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_timer_on.pngbin0 -> 1558 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_wb_cloudy.pngbin0 -> 1224 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_wb_daylight.pngbin0 -> 1781 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_wb_fluorescent.pngbin0 -> 1603 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_wb_off.pngbin0 -> 1044 bytes
-rw-r--r--res/drawable-mdpi/ic_indicator_wb_tungsten.pngbin0 -> 1428 bytes
-rw-r--r--res/drawable-mdpi/ic_location.pngbin1732 -> 1744 bytes
-rw-r--r--res/drawable-mdpi/ic_location_off.pngbin2103 -> 2149 bytes
-rw-r--r--res/drawable-mdpi/ic_sce.pngbin1993 -> 2052 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_action.pngbin2673 -> 2688 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_night.pngbin2165 -> 2188 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_off.pngbin0 -> 2501 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_party.pngbin2557 -> 2544 bytes
-rw-r--r--res/drawable-mdpi/ic_sce_sunset.pngbin2042 -> 2078 bytes
-rw-r--r--res/drawable-mdpi/ic_settings_holo_light.pngbin1827 -> 2183 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_back.pngbin2186 -> 2179 bytes
-rw-r--r--res/drawable-mdpi/ic_switch_front.pngbin2507 -> 2512 bytes
-rw-r--r--res/drawable-mdpi/ic_timer_10s.pngbin2596 -> 2650 bytes
-rw-r--r--res/drawable-mdpi/ic_timer_15s.pngbin2701 -> 2761 bytes
-rw-r--r--res/drawable-mdpi/ic_timer_1s.pngbin2391 -> 2419 bytes
-rw-r--r--res/drawable-mdpi/ic_timer_3s.pngbin2442 -> 2508 bytes
-rw-r--r--res/drawable-mdpi/ic_timer_off.pngbin2232 -> 2253 bytes
-rw-r--r--res/drawable-mdpi/ic_wb_auto.pngbin2241 -> 2255 bytes
-rw-r--r--res/drawable-mdpi/ic_wb_cloudy.pngbin1426 -> 1450 bytes
-rw-r--r--res/drawable-mdpi/ic_wb_fluorescent.pngbin2320 -> 2346 bytes
-rw-r--r--res/drawable-mdpi/ic_wb_incandescent.pngbin1911 -> 1946 bytes
-rw-r--r--res/drawable-mdpi/ic_wb_sunlight.pngbin2430 -> 2580 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_0.pngbin2140 -> 2253 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_holo_light.pngbin5819 -> 5936 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_n1.pngbin1819 -> 1881 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_n2.pngbin2935 -> 2993 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_n3.pngbin3167 -> 3206 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_p1.pngbin2346 -> 2414 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_p2.pngbin3436 -> 3524 bytes
-rw-r--r--res/drawable-xhdpi/ic_exposure_p3.pngbin3622 -> 3701 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_auto_holo_light.pngbin4802 -> 4835 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_off_holo_light.pngbin4817 -> 5010 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_on_holo_light.pngbin3491 -> 3501 bytes
-rw-r--r--res/drawable-xhdpi/ic_flash_torch.pngbin6314 -> 6524 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr.pngbin3999 -> 4022 bytes
-rw-r--r--res/drawable-xhdpi/ic_hdr_off.pngbin5822 -> 5860 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_0.pngbin3325 -> 1970 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_n1.pngbin3420 -> 2075 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_n2.pngbin4347 -> 2935 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_n3.pngbin4471 -> 3154 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_p1.pngbin3870 -> 2461 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_p2.pngbin4778 -> 3353 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_ev_p3.pngbin4982 -> 3545 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_flash_auto.pngbin5261 -> 3626 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_flash_off.pngbin3422 -> 2107 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_flash_on.pngbin4160 -> 2822 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_loc_off.pngbin0 -> 3845 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_loc_on.pngbin0 -> 2492 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_hdr.pngbin0 -> 2903 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_off.pngbin3250 -> 1864 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_sce_on.pngbin4448 -> 3586 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_timer_off.pngbin0 -> 2483 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_timer_on.pngbin0 -> 3381 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_wb_cloudy.pngbin0 -> 2374 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_wb_daylight.pngbin0 -> 4102 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_wb_fluorescent.pngbin0 -> 3379 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_wb_off.pngbin0 -> 2006 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicator_wb_tungsten.pngbin0 -> 2676 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce.pngbin4682 -> 4808 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_action.pngbin6390 -> 6537 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_night.pngbin4876 -> 4969 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_off.pngbin0 -> 6262 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_party.pngbin6451 -> 6658 bytes
-rw-r--r--res/drawable-xhdpi/ic_sce_sunset.pngbin4570 -> 4676 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_holo_light.pngbin3885 -> 4174 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_back.pngbin4799 -> 4913 bytes
-rw-r--r--res/drawable-xhdpi/ic_switch_front.pngbin5630 -> 5638 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer_10s.pngbin6333 -> 6450 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer_15s.pngbin6550 -> 6602 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer_1s.pngbin5520 -> 5694 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer_3s.pngbin5956 -> 6062 bytes
-rw-r--r--res/drawable-xhdpi/ic_timer_off.pngbin5201 -> 5332 bytes
-rw-r--r--res/drawable-xhdpi/ic_wb_auto.pngbin4942 -> 4973 bytes
-rw-r--r--res/drawable-xhdpi/ic_wb_cloudy.pngbin2785 -> 2868 bytes
-rw-r--r--res/drawable-xhdpi/ic_wb_fluorescent.pngbin4881 -> 5057 bytes
-rw-r--r--res/drawable-xhdpi/ic_wb_incandescent.pngbin4143 -> 4287 bytes
-rw-r--r--res/drawable-xhdpi/ic_wb_sunlight.pngbin6268 -> 6350 bytes
-rw-r--r--res/layout-land/camera_controls.xml6
-rw-r--r--res/layout-port/camera_controls.xml6
-rw-r--r--res/layout/menu_indicators.xml43
-rw-r--r--res/values/arrays.xml8
173 files changed, 39 insertions, 24 deletions
diff --git a/res/drawable-hdpi/ic_exposure_0.png b/res/drawable-hdpi/ic_exposure_0.png
index da1fbd0e6..ba19c89c1 100644
--- a/res/drawable-hdpi/ic_exposure_0.png
+++ b/res/drawable-hdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_holo_light.png b/res/drawable-hdpi/ic_exposure_holo_light.png
index 9eaa59de5..39662a4b5 100644
--- a/res/drawable-hdpi/ic_exposure_holo_light.png
+++ b/res/drawable-hdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n1.png b/res/drawable-hdpi/ic_exposure_n1.png
index 4bf5acb1b..e52dd7474 100644
--- a/res/drawable-hdpi/ic_exposure_n1.png
+++ b/res/drawable-hdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n2.png b/res/drawable-hdpi/ic_exposure_n2.png
index e340e3a18..738973de0 100644
--- a/res/drawable-hdpi/ic_exposure_n2.png
+++ b/res/drawable-hdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n3.png b/res/drawable-hdpi/ic_exposure_n3.png
index 65f63a3e2..2cd63b469 100644
--- a/res/drawable-hdpi/ic_exposure_n3.png
+++ b/res/drawable-hdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p1.png b/res/drawable-hdpi/ic_exposure_p1.png
index c0d90b9fd..065e0bc21 100644
--- a/res/drawable-hdpi/ic_exposure_p1.png
+++ b/res/drawable-hdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p2.png b/res/drawable-hdpi/ic_exposure_p2.png
index c6469be34..92450c437 100644
--- a/res/drawable-hdpi/ic_exposure_p2.png
+++ b/res/drawable-hdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p3.png b/res/drawable-hdpi/ic_exposure_p3.png
index c4406aaef..d1be9f69b 100644
--- a/res/drawable-hdpi/ic_exposure_p3.png
+++ b/res/drawable-hdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light.png b/res/drawable-hdpi/ic_flash_auto_holo_light.png
index b0597eabd..a34d63a0c 100644
--- a/res/drawable-hdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_off_holo_light.png b/res/drawable-hdpi/ic_flash_off_holo_light.png
index 019966ce2..3fe45fc80 100644
--- a/res/drawable-hdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_on_holo_light.png b/res/drawable-hdpi/ic_flash_on_holo_light.png
index 30f939894..2d67e4530 100644
--- a/res/drawable-hdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_torch.png b/res/drawable-hdpi/ic_flash_torch.png
index fd4712836..b577d1f65 100644
--- a/res/drawable-hdpi/ic_flash_torch.png
+++ b/res/drawable-hdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr.png b/res/drawable-hdpi/ic_hdr.png
index 3c054998d..cda989058 100644
--- a/res/drawable-hdpi/ic_hdr.png
+++ b/res/drawable-hdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_off.png b/res/drawable-hdpi/ic_hdr_off.png
index 47c727fe6..28db73c89 100644
--- a/res/drawable-hdpi/ic_hdr_off.png
+++ b/res/drawable-hdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_0.png b/res/drawable-hdpi/ic_indicator_ev_0.png
index c1197d6ba..9092025db 100644
--- a/res/drawable-hdpi/ic_indicator_ev_0.png
+++ b/res/drawable-hdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n1.png b/res/drawable-hdpi/ic_indicator_ev_n1.png
index 522ef837a..56c5e60db 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n2.png b/res/drawable-hdpi/ic_indicator_ev_n2.png
index 6c6d98d67..72838de43 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n3.png b/res/drawable-hdpi/ic_indicator_ev_n3.png
index ccbb5cb49..1200d631e 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p1.png b/res/drawable-hdpi/ic_indicator_ev_p1.png
index b92bb67ca..5497c8672 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p2.png b/res/drawable-hdpi/ic_indicator_ev_p2.png
index 5d6091868..25107fe2f 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p3.png b/res/drawable-hdpi/ic_indicator_ev_p3.png
index a1be00699..6d0c1e023 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_auto.png b/res/drawable-hdpi/ic_indicator_flash_auto.png
index e600703c6..edb34a0c6 100644
--- a/res/drawable-hdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-hdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_off.png b/res/drawable-hdpi/ic_indicator_flash_off.png
index 60c70be89..880ad0773 100644
--- a/res/drawable-hdpi/ic_indicator_flash_off.png
+++ b/res/drawable-hdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_on.png b/res/drawable-hdpi/ic_indicator_flash_on.png
index 39316be95..ec3d1d529 100644
--- a/res/drawable-hdpi/ic_indicator_flash_on.png
+++ b/res/drawable-hdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_loc_off.png b/res/drawable-hdpi/ic_indicator_loc_off.png
new file mode 100644
index 000000000..d5937e4d1
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_loc_on.png b/res/drawable-hdpi/ic_indicator_loc_on.png
new file mode 100644
index 000000000..ae272a107
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_hdr.png b/res/drawable-hdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 000000000..de09fe158
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_off.png b/res/drawable-hdpi/ic_indicator_sce_off.png
index 1814bfda0..076d82303 100644
--- a/res/drawable-hdpi/ic_indicator_sce_off.png
+++ b/res/drawable-hdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_on.png b/res/drawable-hdpi/ic_indicator_sce_on.png
index 71aa22959..9ce466b81 100644
--- a/res/drawable-hdpi/ic_indicator_sce_on.png
+++ b/res/drawable-hdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_timer_off.png b/res/drawable-hdpi/ic_indicator_timer_off.png
new file mode 100644
index 000000000..e377f89b8
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_timer_on.png b/res/drawable-hdpi/ic_indicator_timer_on.png
new file mode 100644
index 000000000..8ceade651
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_cloudy.png b/res/drawable-hdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 000000000..62f5c9985
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_daylight.png b/res/drawable-hdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 000000000..ffadb0e84
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_fluorescent.png b/res/drawable-hdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 000000000..3c30bfb73
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_off.png b/res/drawable-hdpi/ic_indicator_wb_off.png
new file mode 100644
index 000000000..abe7405e1
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_tungsten.png b/res/drawable-hdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 000000000..6de19d56d
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_location.png b/res/drawable-hdpi/ic_location.png
index f51acd87e..ff85d79f1 100644
--- a/res/drawable-hdpi/ic_location.png
+++ b/res/drawable-hdpi/ic_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_location_off.png b/res/drawable-hdpi/ic_location_off.png
index 402944c75..ae6e2ea23 100644
--- a/res/drawable-hdpi/ic_location_off.png
+++ b/res/drawable-hdpi/ic_location_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce.png b/res/drawable-hdpi/ic_sce.png
index edc538398..dd8bbd795 100644
--- a/res/drawable-hdpi/ic_sce.png
+++ b/res/drawable-hdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_action.png b/res/drawable-hdpi/ic_sce_action.png
index 0b1285d20..f96859291 100644
--- a/res/drawable-hdpi/ic_sce_action.png
+++ b/res/drawable-hdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_night.png b/res/drawable-hdpi/ic_sce_night.png
index 62bedc7f8..dc42ec972 100644
--- a/res/drawable-hdpi/ic_sce_night.png
+++ b/res/drawable-hdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_off.png b/res/drawable-hdpi/ic_sce_off.png
new file mode 100644
index 000000000..4c64578a5
--- /dev/null
+++ b/res/drawable-hdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_party.png b/res/drawable-hdpi/ic_sce_party.png
index 7f2947a23..6c664ba21 100644
--- a/res/drawable-hdpi/ic_sce_party.png
+++ b/res/drawable-hdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_sunset.png b/res/drawable-hdpi/ic_sce_sunset.png
index 15a4be0c0..82f74e6fb 100644
--- a/res/drawable-hdpi/ic_sce_sunset.png
+++ b/res/drawable-hdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png
index c3428460e..5d315a3bb 100644
--- a/res/drawable-hdpi/ic_settings_holo_light.png
+++ b/res/drawable-hdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_back.png b/res/drawable-hdpi/ic_switch_back.png
index 7d0ee618b..02b1c6bd9 100644
--- a/res/drawable-hdpi/ic_switch_back.png
+++ b/res/drawable-hdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_front.png b/res/drawable-hdpi/ic_switch_front.png
index e8e99ce15..09cbc24b0 100644
--- a/res/drawable-hdpi/ic_switch_front.png
+++ b/res/drawable-hdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_10s.png b/res/drawable-hdpi/ic_timer_10s.png
index 3eed668d8..942795659 100644
--- a/res/drawable-hdpi/ic_timer_10s.png
+++ b/res/drawable-hdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_15s.png b/res/drawable-hdpi/ic_timer_15s.png
index 81743addf..ea0072ad3 100644
--- a/res/drawable-hdpi/ic_timer_15s.png
+++ b/res/drawable-hdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_1s.png b/res/drawable-hdpi/ic_timer_1s.png
index 32128ad50..e53f13996 100644
--- a/res/drawable-hdpi/ic_timer_1s.png
+++ b/res/drawable-hdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_3s.png b/res/drawable-hdpi/ic_timer_3s.png
index 6e27246bc..dc7e33e50 100644
--- a/res/drawable-hdpi/ic_timer_3s.png
+++ b/res/drawable-hdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_off.png b/res/drawable-hdpi/ic_timer_off.png
index 6d7bfbf01..ab095ce54 100644
--- a/res/drawable-hdpi/ic_timer_off.png
+++ b/res/drawable-hdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_auto.png b/res/drawable-hdpi/ic_wb_auto.png
index 4b887e978..0e07a041f 100644
--- a/res/drawable-hdpi/ic_wb_auto.png
+++ b/res/drawable-hdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_cloudy.png b/res/drawable-hdpi/ic_wb_cloudy.png
index 1d13d9a85..fb42ada92 100644
--- a/res/drawable-hdpi/ic_wb_cloudy.png
+++ b/res/drawable-hdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_fluorescent.png b/res/drawable-hdpi/ic_wb_fluorescent.png
index e0c9e5f97..fbf8c9682 100644
--- a/res/drawable-hdpi/ic_wb_fluorescent.png
+++ b/res/drawable-hdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_incandescent.png b/res/drawable-hdpi/ic_wb_incandescent.png
index 352b869b1..295a807e6 100644
--- a/res/drawable-hdpi/ic_wb_incandescent.png
+++ b/res/drawable-hdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_sunlight.png b/res/drawable-hdpi/ic_wb_sunlight.png
index 0b7719a7f..d256509be 100644
--- a/res/drawable-hdpi/ic_wb_sunlight.png
+++ b/res/drawable-hdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_0.png b/res/drawable-mdpi/ic_exposure_0.png
index 52091b87c..a3dcee411 100644
--- a/res/drawable-mdpi/ic_exposure_0.png
+++ b/res/drawable-mdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_holo_light.png b/res/drawable-mdpi/ic_exposure_holo_light.png
index 664305f82..ebd2f41f5 100644
--- a/res/drawable-mdpi/ic_exposure_holo_light.png
+++ b/res/drawable-mdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n1.png b/res/drawable-mdpi/ic_exposure_n1.png
index a70335398..e73f8b338 100644
--- a/res/drawable-mdpi/ic_exposure_n1.png
+++ b/res/drawable-mdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n2.png b/res/drawable-mdpi/ic_exposure_n2.png
index df1ab97c8..662c1f8b7 100644
--- a/res/drawable-mdpi/ic_exposure_n2.png
+++ b/res/drawable-mdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n3.png b/res/drawable-mdpi/ic_exposure_n3.png
index 2d66d48ba..e9c5243ad 100644
--- a/res/drawable-mdpi/ic_exposure_n3.png
+++ b/res/drawable-mdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p1.png b/res/drawable-mdpi/ic_exposure_p1.png
index 91877fbbb..a6703c2c7 100644
--- a/res/drawable-mdpi/ic_exposure_p1.png
+++ b/res/drawable-mdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p2.png b/res/drawable-mdpi/ic_exposure_p2.png
index 935455e34..9e29e4bb2 100644
--- a/res/drawable-mdpi/ic_exposure_p2.png
+++ b/res/drawable-mdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p3.png b/res/drawable-mdpi/ic_exposure_p3.png
index c8af74047..89e659a4f 100644
--- a/res/drawable-mdpi/ic_exposure_p3.png
+++ b/res/drawable-mdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_auto_holo_light.png b/res/drawable-mdpi/ic_flash_auto_holo_light.png
index 66d211dd0..55794e473 100644
--- a/res/drawable-mdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_off_holo_light.png b/res/drawable-mdpi/ic_flash_off_holo_light.png
index 43623dd52..73b8ca805 100644
--- a/res/drawable-mdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_on_holo_light.png b/res/drawable-mdpi/ic_flash_on_holo_light.png
index 1e7aca531..9c99d37b4 100644
--- a/res/drawable-mdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_torch.png b/res/drawable-mdpi/ic_flash_torch.png
index 65271f990..398be5165 100644
--- a/res/drawable-mdpi/ic_flash_torch.png
+++ b/res/drawable-mdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr.png b/res/drawable-mdpi/ic_hdr.png
index a197627cc..45dae46ad 100644
--- a/res/drawable-mdpi/ic_hdr.png
+++ b/res/drawable-mdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_off.png b/res/drawable-mdpi/ic_hdr_off.png
index 0856cb064..c5003e60c 100644
--- a/res/drawable-mdpi/ic_hdr_off.png
+++ b/res/drawable-mdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_0.png b/res/drawable-mdpi/ic_indicator_ev_0.png
index a205fb0d5..6634dd9e3 100644
--- a/res/drawable-mdpi/ic_indicator_ev_0.png
+++ b/res/drawable-mdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n1.png b/res/drawable-mdpi/ic_indicator_ev_n1.png
index 87352f77a..528ecd39b 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n2.png b/res/drawable-mdpi/ic_indicator_ev_n2.png
index 422f91648..db4deb1a5 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n3.png b/res/drawable-mdpi/ic_indicator_ev_n3.png
index 8c97a4d88..6b01a56d6 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p1.png b/res/drawable-mdpi/ic_indicator_ev_p1.png
index 92998a69b..9a1f6f390 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p2.png b/res/drawable-mdpi/ic_indicator_ev_p2.png
index 74806ba52..712ded53b 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p3.png b/res/drawable-mdpi/ic_indicator_ev_p3.png
index 41f0039d9..d01c2c24f 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_auto.png b/res/drawable-mdpi/ic_indicator_flash_auto.png
index bc6cc5662..c60e423cd 100644
--- a/res/drawable-mdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-mdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_off.png b/res/drawable-mdpi/ic_indicator_flash_off.png
index d84025a5c..6c2d75a2c 100644
--- a/res/drawable-mdpi/ic_indicator_flash_off.png
+++ b/res/drawable-mdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_on.png b/res/drawable-mdpi/ic_indicator_flash_on.png
index e21b544e1..84270729e 100644
--- a/res/drawable-mdpi/ic_indicator_flash_on.png
+++ b/res/drawable-mdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_loc_off.png b/res/drawable-mdpi/ic_indicator_loc_off.png
new file mode 100644
index 000000000..87841e321
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_loc_on.png b/res/drawable-mdpi/ic_indicator_loc_on.png
new file mode 100644
index 000000000..56a3a3b40
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_hdr.png b/res/drawable-mdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 000000000..06519411e
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_off.png b/res/drawable-mdpi/ic_indicator_sce_off.png
index 0cb5d31f4..52ad71394 100644
--- a/res/drawable-mdpi/ic_indicator_sce_off.png
+++ b/res/drawable-mdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_on.png b/res/drawable-mdpi/ic_indicator_sce_on.png
index ad08c11d8..510c39f1f 100644
--- a/res/drawable-mdpi/ic_indicator_sce_on.png
+++ b/res/drawable-mdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_timer_off.png b/res/drawable-mdpi/ic_indicator_timer_off.png
new file mode 100644
index 000000000..c5f8117b1
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_timer_on.png b/res/drawable-mdpi/ic_indicator_timer_on.png
new file mode 100644
index 000000000..03d6c1b48
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_cloudy.png b/res/drawable-mdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 000000000..858394fb3
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_daylight.png b/res/drawable-mdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 000000000..b8520e1ca
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_fluorescent.png b/res/drawable-mdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 000000000..cb34af186
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_off.png b/res/drawable-mdpi/ic_indicator_wb_off.png
new file mode 100644
index 000000000..f20ddf50e
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_tungsten.png b/res/drawable-mdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 000000000..ebfb22575
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_location.png b/res/drawable-mdpi/ic_location.png
index 2a4e9bf7f..57cecbaeb 100644
--- a/res/drawable-mdpi/ic_location.png
+++ b/res/drawable-mdpi/ic_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_location_off.png b/res/drawable-mdpi/ic_location_off.png
index f9971f10f..548fd96ae 100644
--- a/res/drawable-mdpi/ic_location_off.png
+++ b/res/drawable-mdpi/ic_location_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce.png b/res/drawable-mdpi/ic_sce.png
index f55c15d31..724d27820 100644
--- a/res/drawable-mdpi/ic_sce.png
+++ b/res/drawable-mdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_action.png b/res/drawable-mdpi/ic_sce_action.png
index b43532b12..2cd9a8c7c 100644
--- a/res/drawable-mdpi/ic_sce_action.png
+++ b/res/drawable-mdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_night.png b/res/drawable-mdpi/ic_sce_night.png
index 8ab9a0e6f..94792623f 100644
--- a/res/drawable-mdpi/ic_sce_night.png
+++ b/res/drawable-mdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_off.png b/res/drawable-mdpi/ic_sce_off.png
new file mode 100644
index 000000000..2a3f9503f
--- /dev/null
+++ b/res/drawable-mdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_party.png b/res/drawable-mdpi/ic_sce_party.png
index 8d8a08624..5f0f9cf1e 100644
--- a/res/drawable-mdpi/ic_sce_party.png
+++ b/res/drawable-mdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_sunset.png b/res/drawable-mdpi/ic_sce_sunset.png
index 09d385913..0cede836c 100644
--- a/res/drawable-mdpi/ic_sce_sunset.png
+++ b/res/drawable-mdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png
index 0f87e8cde..5b39398c2 100644
--- a/res/drawable-mdpi/ic_settings_holo_light.png
+++ b/res/drawable-mdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_back.png b/res/drawable-mdpi/ic_switch_back.png
index 71d61fe0e..6dce90375 100644
--- a/res/drawable-mdpi/ic_switch_back.png
+++ b/res/drawable-mdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_front.png b/res/drawable-mdpi/ic_switch_front.png
index 823bbd5ad..c8ff3be62 100644
--- a/res/drawable-mdpi/ic_switch_front.png
+++ b/res/drawable-mdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_10s.png b/res/drawable-mdpi/ic_timer_10s.png
index 3497d8e69..40bbb8cbd 100644
--- a/res/drawable-mdpi/ic_timer_10s.png
+++ b/res/drawable-mdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_15s.png b/res/drawable-mdpi/ic_timer_15s.png
index a61f8774f..53d33d9bc 100644
--- a/res/drawable-mdpi/ic_timer_15s.png
+++ b/res/drawable-mdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_1s.png b/res/drawable-mdpi/ic_timer_1s.png
index a2005a484..3b296e53c 100644
--- a/res/drawable-mdpi/ic_timer_1s.png
+++ b/res/drawable-mdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_3s.png b/res/drawable-mdpi/ic_timer_3s.png
index 7af60aa1a..2cf11eb64 100644
--- a/res/drawable-mdpi/ic_timer_3s.png
+++ b/res/drawable-mdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_off.png b/res/drawable-mdpi/ic_timer_off.png
index 0a986f0ee..d89f8d912 100644
--- a/res/drawable-mdpi/ic_timer_off.png
+++ b/res/drawable-mdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_auto.png b/res/drawable-mdpi/ic_wb_auto.png
index 0a410d409..3da3a5c0b 100644
--- a/res/drawable-mdpi/ic_wb_auto.png
+++ b/res/drawable-mdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_cloudy.png b/res/drawable-mdpi/ic_wb_cloudy.png
index 0616d8101..5dc6fbd08 100644
--- a/res/drawable-mdpi/ic_wb_cloudy.png
+++ b/res/drawable-mdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_fluorescent.png b/res/drawable-mdpi/ic_wb_fluorescent.png
index 0d303477e..87c001bc7 100644
--- a/res/drawable-mdpi/ic_wb_fluorescent.png
+++ b/res/drawable-mdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_incandescent.png b/res/drawable-mdpi/ic_wb_incandescent.png
index 64e9110ba..f6512efff 100644
--- a/res/drawable-mdpi/ic_wb_incandescent.png
+++ b/res/drawable-mdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_sunlight.png b/res/drawable-mdpi/ic_wb_sunlight.png
index 79df11986..4a07ec46c 100644
--- a/res/drawable-mdpi/ic_wb_sunlight.png
+++ b/res/drawable-mdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_0.png b/res/drawable-xhdpi/ic_exposure_0.png
index 07a681168..5752ed7ed 100644
--- a/res/drawable-xhdpi/ic_exposure_0.png
+++ b/res/drawable-xhdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_holo_light.png b/res/drawable-xhdpi/ic_exposure_holo_light.png
index 93f6fd1bf..06501adfb 100644
--- a/res/drawable-xhdpi/ic_exposure_holo_light.png
+++ b/res/drawable-xhdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n1.png b/res/drawable-xhdpi/ic_exposure_n1.png
index e4787ab21..d7fe9179f 100644
--- a/res/drawable-xhdpi/ic_exposure_n1.png
+++ b/res/drawable-xhdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n2.png b/res/drawable-xhdpi/ic_exposure_n2.png
index ee9ac2334..5c47b96bc 100644
--- a/res/drawable-xhdpi/ic_exposure_n2.png
+++ b/res/drawable-xhdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n3.png b/res/drawable-xhdpi/ic_exposure_n3.png
index 0d25da80d..6bf4ccb99 100644
--- a/res/drawable-xhdpi/ic_exposure_n3.png
+++ b/res/drawable-xhdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p1.png b/res/drawable-xhdpi/ic_exposure_p1.png
index 8edec9bc1..c30265ed7 100644
--- a/res/drawable-xhdpi/ic_exposure_p1.png
+++ b/res/drawable-xhdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p2.png b/res/drawable-xhdpi/ic_exposure_p2.png
index ab1e12227..183d25f58 100644
--- a/res/drawable-xhdpi/ic_exposure_p2.png
+++ b/res/drawable-xhdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p3.png b/res/drawable-xhdpi/ic_exposure_p3.png
index e9f4bca7c..581a9a709 100644
--- a/res/drawable-xhdpi/ic_exposure_p3.png
+++ b/res/drawable-xhdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-xhdpi/ic_flash_auto_holo_light.png
index 3b14acb0f..266d1c27c 100644
--- a/res/drawable-xhdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_off_holo_light.png b/res/drawable-xhdpi/ic_flash_off_holo_light.png
index 9b13a364f..e289ac215 100644
--- a/res/drawable-xhdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_on_holo_light.png b/res/drawable-xhdpi/ic_flash_on_holo_light.png
index 8cd0548b4..e2c63c7ca 100644
--- a/res/drawable-xhdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_torch.png b/res/drawable-xhdpi/ic_flash_torch.png
index 2801e29e5..568179327 100644
--- a/res/drawable-xhdpi/ic_flash_torch.png
+++ b/res/drawable-xhdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr.png b/res/drawable-xhdpi/ic_hdr.png
index 442c7df48..12203a2d5 100644
--- a/res/drawable-xhdpi/ic_hdr.png
+++ b/res/drawable-xhdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_off.png b/res/drawable-xhdpi/ic_hdr_off.png
index 0fb7d61ed..66fe29e0d 100644
--- a/res/drawable-xhdpi/ic_hdr_off.png
+++ b/res/drawable-xhdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_0.png b/res/drawable-xhdpi/ic_indicator_ev_0.png
index 949ed99f7..b86bb301a 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_0.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n1.png b/res/drawable-xhdpi/ic_indicator_ev_n1.png
index 014beca1c..e99cc6601 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n2.png b/res/drawable-xhdpi/ic_indicator_ev_n2.png
index 109fdfdee..aced71d2d 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n3.png b/res/drawable-xhdpi/ic_indicator_ev_n3.png
index 27d75fb2b..41b9f5961 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p1.png b/res/drawable-xhdpi/ic_indicator_ev_p1.png
index 800a0fdb3..2850c9555 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p2.png b/res/drawable-xhdpi/ic_indicator_ev_p2.png
index 933fc71e4..c6355b138 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p3.png b/res/drawable-xhdpi/ic_indicator_ev_p3.png
index 82a5e0beb..99b860dd7 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_auto.png b/res/drawable-xhdpi/ic_indicator_flash_auto.png
index 746a72136..08f507b2a 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_off.png b/res/drawable-xhdpi/ic_indicator_flash_off.png
index af67e5edf..a3580f1a1 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_off.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_on.png b/res/drawable-xhdpi/ic_indicator_flash_on.png
index fdf80943d..7e05e156e 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_on.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_loc_off.png b/res/drawable-xhdpi/ic_indicator_loc_off.png
new file mode 100644
index 000000000..966855c54
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_loc_on.png b/res/drawable-xhdpi/ic_indicator_loc_on.png
new file mode 100644
index 000000000..3a4b44e2e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_hdr.png b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 000000000..b60abb335
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_off.png b/res/drawable-xhdpi/ic_indicator_sce_off.png
index dc58bb9b2..aad8cf806 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_off.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_on.png b/res/drawable-xhdpi/ic_indicator_sce_on.png
index 7db8f9c72..39cfa4b52 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_on.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_timer_off.png b/res/drawable-xhdpi/ic_indicator_timer_off.png
new file mode 100644
index 000000000..0bbb9ee36
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_timer_on.png b/res/drawable-xhdpi/ic_indicator_timer_on.png
new file mode 100644
index 000000000..07cef150e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_cloudy.png b/res/drawable-xhdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 000000000..862ad5fce
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_daylight.png b/res/drawable-xhdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 000000000..5c2a4ddf8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png b/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 000000000..226b36cf8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_off.png b/res/drawable-xhdpi/ic_indicator_wb_off.png
new file mode 100644
index 000000000..c5e38b1b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_tungsten.png b/res/drawable-xhdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 000000000..a0b448585
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce.png b/res/drawable-xhdpi/ic_sce.png
index 33a553d60..44d0d7a0e 100644
--- a/res/drawable-xhdpi/ic_sce.png
+++ b/res/drawable-xhdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_action.png b/res/drawable-xhdpi/ic_sce_action.png
index c2f7b72b3..d79a7e0c1 100644
--- a/res/drawable-xhdpi/ic_sce_action.png
+++ b/res/drawable-xhdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_night.png b/res/drawable-xhdpi/ic_sce_night.png
index 7541a1d5f..5dd62fcc6 100644
--- a/res/drawable-xhdpi/ic_sce_night.png
+++ b/res/drawable-xhdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_off.png b/res/drawable-xhdpi/ic_sce_off.png
new file mode 100644
index 000000000..0279dcc10
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_party.png b/res/drawable-xhdpi/ic_sce_party.png
index c2b581f45..638d2d34d 100644
--- a/res/drawable-xhdpi/ic_sce_party.png
+++ b/res/drawable-xhdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_sunset.png b/res/drawable-xhdpi/ic_sce_sunset.png
index 846f73698..721966e43 100644
--- a/res/drawable-xhdpi/ic_sce_sunset.png
+++ b/res/drawable-xhdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png
index 39be7bdae..0da5b5eab 100644
--- a/res/drawable-xhdpi/ic_settings_holo_light.png
+++ b/res/drawable-xhdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_back.png b/res/drawable-xhdpi/ic_switch_back.png
index 8a10f6dc6..26f5e099f 100644
--- a/res/drawable-xhdpi/ic_switch_back.png
+++ b/res/drawable-xhdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_front.png b/res/drawable-xhdpi/ic_switch_front.png
index 39b974b69..8c0383a6a 100644
--- a/res/drawable-xhdpi/ic_switch_front.png
+++ b/res/drawable-xhdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_10s.png b/res/drawable-xhdpi/ic_timer_10s.png
index f03b3edf6..cbda71d91 100644
--- a/res/drawable-xhdpi/ic_timer_10s.png
+++ b/res/drawable-xhdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_15s.png b/res/drawable-xhdpi/ic_timer_15s.png
index adce51d08..373e0c9a3 100644
--- a/res/drawable-xhdpi/ic_timer_15s.png
+++ b/res/drawable-xhdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_1s.png b/res/drawable-xhdpi/ic_timer_1s.png
index 3df431da4..dd224a44d 100644
--- a/res/drawable-xhdpi/ic_timer_1s.png
+++ b/res/drawable-xhdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_3s.png b/res/drawable-xhdpi/ic_timer_3s.png
index a1396b2f6..1f12fc673 100644
--- a/res/drawable-xhdpi/ic_timer_3s.png
+++ b/res/drawable-xhdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_off.png b/res/drawable-xhdpi/ic_timer_off.png
index ed637cf0a..84693941f 100644
--- a/res/drawable-xhdpi/ic_timer_off.png
+++ b/res/drawable-xhdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_auto.png b/res/drawable-xhdpi/ic_wb_auto.png
index c434eeea3..cbacd04c4 100644
--- a/res/drawable-xhdpi/ic_wb_auto.png
+++ b/res/drawable-xhdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_cloudy.png b/res/drawable-xhdpi/ic_wb_cloudy.png
index 199bc58ee..cf8ec8cd4 100644
--- a/res/drawable-xhdpi/ic_wb_cloudy.png
+++ b/res/drawable-xhdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_fluorescent.png b/res/drawable-xhdpi/ic_wb_fluorescent.png
index b9ab74a1f..6e03a85e6 100644
--- a/res/drawable-xhdpi/ic_wb_fluorescent.png
+++ b/res/drawable-xhdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_incandescent.png b/res/drawable-xhdpi/ic_wb_incandescent.png
index eab4c6e5f..367ded31e 100644
--- a/res/drawable-xhdpi/ic_wb_incandescent.png
+++ b/res/drawable-xhdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_sunlight.png b/res/drawable-xhdpi/ic_wb_sunlight.png
index 12602e610..497c4bdcc 100644
--- a/res/drawable-xhdpi/ic_wb_sunlight.png
+++ b/res/drawable-xhdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 683f0e50b..e99c0cb0c 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -26,10 +26,10 @@
android:layout_gravity="right" />
<include layout="@layout/menu_indicators"
- android:layout_width="80dip"
- android:layout_height="80dip"
+ android:layout_width="64dip"
+ android:layout_height="64dip"
android:layout_marginTop="-5dip"
- android:layout_marginRight="-2dip"
+ android:layout_marginRight="6dip"
android:layout_gravity="top|right"/>
<com.android.camera.ui.PieMenuButton
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 76e23be98..77a19e9e6 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -26,10 +26,10 @@
android:layout_gravity="bottom" />
<include layout="@layout/menu_indicators"
- android:layout_width="80dip"
- android:layout_height="80dip"
+ android:layout_width="64dip"
+ android:layout_height="64dip"
android:layout_gravity="bottom|right"
- android:layout_marginBottom="-2dip"
+ android:layout_marginBottom="6dip"
android:layout_marginRight="-5dip" />
<com.android.camera.ui.PieMenuButton
diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml
index 08e04659d..da81e8a11 100644
--- a/res/layout/menu_indicators.xml
+++ b/res/layout/menu_indicators.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -13,38 +13,45 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/on_screen_indicators"
- android:layout_width="80dip"
- android:layout_height="80dip" >
+ android:layout_width="64dip"
+ android:layout_height="64dip" >
<ImageView
- android:id="@+id/menu_hdr_indicator"
+ android:id="@+id/menu_scenemode_indicator"
+ style="@style/MenuIndicator"
+ android:layout_gravity="left|top"
+ android:src="@drawable/ic_indicator_sce_off" />
+
+ <ImageView
+ android:id="@+id/menu_timer_indicator"
style="@style/MenuIndicator"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:src="@drawable/ic_indicator_hdr_off" />
+ android:layout_gravity="center_horizontal|top"
+ android:src="@drawable/ic_indicator_timer_off" />
<ImageView
android:id="@+id/menu_flash_indicator"
style="@style/MenuIndicator"
- android:layout_toRightOf="@id/menu_hdr_indicator"
- android:layout_alignTop="@id/menu_hdr_indicator"
+ android:layout_gravity="right|top"
android:src="@drawable/ic_indicator_flash_off" />
<ImageView
android:id="@+id/menu_exposure_indicator"
style="@style/MenuIndicator"
- android:layout_below="@id/menu_hdr_indicator"
- android:layout_alignLeft="@id/menu_hdr_indicator"
- android:layout_alignParentLeft="true"
+ android:layout_gravity="left|bottom"
android:src="@drawable/ic_indicator_ev_0" />
<ImageView
- android:id="@+id/menu_scenemode_indicator"
+ android:id="@+id/menu_location_indicator"
style="@style/MenuIndicator"
- android:layout_alignTop="@id/menu_exposure_indicator"
- android:layout_toRightOf="@id/menu_exposure_indicator"
- android:src="@drawable/ic_indicator_sce_off" />
+ android:layout_gravity="center_horizontal|bottom"
+ android:src="@drawable/ic_indicator_loc_off" />
+
+ <ImageView
+ android:id="@+id/menu_wb_indicator"
+ style="@style/MenuIndicator"
+ android:layout_gravity="right|bottom"
+ android:src="@drawable/ic_indicator_wb_off" />
-</RelativeLayout>
+</FrameLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7ad62fa56..0f010291d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -324,6 +324,14 @@
<item>@drawable/ic_wb_cloudy</item>
</array>
+ <array name="camera_wb_indicators" translatable="false">
+ <item>@drawable/ic_indicator_wb_tungsten</item>
+ <item>@drawable/ic_indicator_wb_fluorescent</item>
+ <item>@drawable/ic_indicator_wb_off</item>
+ <item>@drawable/ic_indicator_wb_daylight</item>
+ <item>@drawable/ic_indicator_wb_cloudy</item>
+ </array>
+
<!-- Camera Preferences Scene Mode dialog box entries -->
<string-array name="pref_camera_scenemode_entries" translatable="false">
<item>@string/pref_camera_scenemode_entry_action</item>