From 05144ea1efd569a46e02f7b729150b7ca80b695f Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 7 Aug 2014 18:02:07 -0700 Subject: Route zoom value through to zoomIndex in device API Current UI is wired to track zoom index, so pass that in rather than the unfinished new zoom ratio API. This finishes the fix for zoom in the app. Extended TODO already there. App should continue to operate until one big refactor moves it form working with zoom indices, to working with zoom ratios, no breakage in between. Bug: 16527845 Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38 --- src/com/android/camera/PhotoModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c39766b8e..75de51621 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2289,7 +2289,7 @@ public class PhotoModule mCameraCapabilities.supports(CameraCapabilities.FocusMode.CONTINUOUS_PICTURE); } - // TODO: Remove this + // TODO: Use zoomRatio device API rather than deprecated zoomIndex @Override public int onZoomChanged(int index) { // Not useful to change zoom value when the activity is paused. @@ -2301,7 +2301,7 @@ public class PhotoModule return index; } // Set zoom parameters asynchronously - mCameraSettings.setZoomRatio(mZoomValue); + mCameraSettings.setZoomIndex(mZoomValue); mCameraDevice.applySettings(mCameraSettings); CameraSettings settings = mCameraDevice.getSettings(); if (settings != null) { -- cgit v1.2.3 From 7870958ca8cbd87470a374b6f49c3c21f26b659a Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Thu, 7 Aug 2014 14:56:27 -0700 Subject: rollback of b/16632474 and ag/518674 Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4 --- AndroidManifest.xml | 2 +- src/com/android/camera/CameraActivity.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 28ea1c223..284b361dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -6,7 +6,7 @@ + android:targetSdkVersion="21" /> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e49ad4671..5d02672ea 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -258,7 +258,6 @@ public class CameraActivity extends Activity private static final int LIGHTS_OUT_DELAY_MS = 4000; private final int BASE_SYS_UI_VISIBILITY = View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE; private final Runnable mLightsOutRunnable = new Runnable() { @Override -- cgit v1.2.3 From 13b9f0579d7e6db914d040d7440e79016f2a23c5 Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Tue, 26 Aug 2014 12:15:41 -0700 Subject: Enable mode options when capture is done. Bug: 17260403 Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7 --- src/com/android/camera/CaptureModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index da850adb0..6b2e98b1e 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -500,6 +500,7 @@ public class CaptureModule extends CameraModule getServices().getRemoteShutterListener().onModuleReady(this); // TODO: Check if we can really take a photo right now (memory, camera // state, ... ). + mAppController.getCameraAppUI().enableModeOptions(); mAppController.setShutterEnabled(true); } @@ -709,6 +710,9 @@ public class CaptureModule extends CameraModule @Override public void onReadyStateChanged(boolean readyForCapture) { + if (readyForCapture) { + mAppController.getCameraAppUI().enableModeOptions(); + } mAppController.setShutterEnabled(readyForCapture); } @@ -725,6 +729,8 @@ public class CaptureModule extends CameraModule @Override public void onPictureTaken(CaptureSession session) { + mAppController.getCameraAppUI().enableModeOptions(); + mAppController.getCameraAppUI().setShutterButtonEnabled(true); } @Override -- cgit v1.2.3 From 320bd2ed832e44fd93376958f031a5162a07863b Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Fri, 22 Aug 2014 15:15:48 -0700 Subject: boatload of new assets also: bug: 17255612 Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5 --- res/drawable-hdpi/aspect_ratio_16x9_selected.png | Bin 7802 -> 57486 bytes res/drawable-hdpi/aspect_ratio_16x9_unselected.png | Bin 6692 -> 56840 bytes res/drawable-hdpi/aspect_ratio_4x3_selected.png | Bin 7541 -> 56792 bytes res/drawable-hdpi/aspect_ratio_4x3_unselected.png | Bin 6491 -> 56392 bytes res/drawable-hdpi/geo_opt_in_graphic.png | Bin 8375 -> 40599 bytes res/drawable-hdpi/ic_camera_blanket.png | Bin 0 -> 1548 bytes res/drawable-hdpi/ic_camera_disabled.png | Bin 1071 -> 543 bytes res/drawable-hdpi/ic_camera_normal.png | Bin 0 -> 586 bytes res/drawable-hdpi/ic_capture_camera_disabled.png | Bin 0 -> 959 bytes res/drawable-hdpi/ic_capture_camera_normal.png | Bin 0 -> 990 bytes res/drawable-hdpi/ic_capture_video.png | Bin 0 -> 516 bytes res/drawable-hdpi/ic_capture_video_disabled.png | Bin 0 -> 474 bytes res/drawable-hdpi/ic_done_disabled.png | Bin 0 -> 825 bytes res/drawable-hdpi/ic_done_normal.png | Bin 0 -> 829 bytes res/drawable-hdpi/ic_edit_disabled.png | Bin 1361 -> 394 bytes res/drawable-hdpi/ic_edit_normal.png | Bin 1378 -> 320 bytes res/drawable-hdpi/ic_exposure_0.png | Bin 944 -> 349 bytes res/drawable-hdpi/ic_exposure_0_disabled.png | Bin 0 -> 396 bytes res/drawable-hdpi/ic_exposure_0_indicator.png | Bin 781 -> 272 bytes res/drawable-hdpi/ic_exposure_disabled.png | Bin 841 -> 468 bytes res/drawable-hdpi/ic_exposure_indicator.png | Bin 0 -> 329 bytes res/drawable-hdpi/ic_exposure_n1.png | Bin 698 -> 283 bytes res/drawable-hdpi/ic_exposure_n1_disabled.png | Bin 0 -> 280 bytes res/drawable-hdpi/ic_exposure_n1_indicator.png | Bin 640 -> 215 bytes res/drawable-hdpi/ic_exposure_n2.png | Bin 1117 -> 395 bytes res/drawable-hdpi/ic_exposure_n2_disabled.png | Bin 0 -> 442 bytes res/drawable-hdpi/ic_exposure_n2_indicator.png | Bin 900 -> 281 bytes res/drawable-hdpi/ic_exposure_normal.png | Bin 1023 -> 465 bytes res/drawable-hdpi/ic_exposure_p1.png | Bin 879 -> 311 bytes res/drawable-hdpi/ic_exposure_p1_disabled.png | Bin 0 -> 311 bytes res/drawable-hdpi/ic_exposure_p1_indicator.png | Bin 768 -> 227 bytes res/drawable-hdpi/ic_exposure_p2.png | Bin 1313 -> 439 bytes res/drawable-hdpi/ic_exposure_p2_disabled.png | Bin 0 -> 473 bytes res/drawable-hdpi/ic_exposure_p2_indicator.png | Bin 1004 -> 303 bytes res/drawable-hdpi/ic_flash_auto_disabled.png | Bin 1070 -> 538 bytes res/drawable-hdpi/ic_flash_auto_indicator.png | Bin 1048 -> 348 bytes res/drawable-hdpi/ic_flash_auto_normal.png | Bin 1200 -> 498 bytes res/drawable-hdpi/ic_flash_off_disabled.png | Bin 1064 -> 468 bytes res/drawable-hdpi/ic_flash_off_indicator.png | Bin 1023 -> 321 bytes res/drawable-hdpi/ic_flash_off_normal.png | Bin 1069 -> 409 bytes res/drawable-hdpi/ic_flash_on_disabled.png | Bin 895 -> 340 bytes res/drawable-hdpi/ic_flash_on_indicator.png | Bin 892 -> 265 bytes res/drawable-hdpi/ic_flash_on_normal.png | Bin 976 -> 357 bytes res/drawable-hdpi/ic_grid_off_disabled.png | Bin 1307 -> 544 bytes res/drawable-hdpi/ic_grid_off_indicator.png | Bin 1312 -> 392 bytes res/drawable-hdpi/ic_grid_off_normal.png | Bin 1635 -> 468 bytes res/drawable-hdpi/ic_grid_on_disabled.png | Bin 883 -> 327 bytes res/drawable-hdpi/ic_grid_on_indicator.png | Bin 928 -> 241 bytes res/drawable-hdpi/ic_grid_on_normal.png | Bin 1096 -> 296 bytes res/drawable-hdpi/ic_hdr_off_disabled.png | Bin 1258 -> 579 bytes res/drawable-hdpi/ic_hdr_off_indicator.png | Bin 1126 -> 379 bytes res/drawable-hdpi/ic_hdr_off_normal.png | Bin 1378 -> 517 bytes res/drawable-hdpi/ic_hdr_on_disabled.png | Bin 962 -> 447 bytes res/drawable-hdpi/ic_hdr_on_indicator.png | Bin 945 -> 282 bytes res/drawable-hdpi/ic_hdr_on_normal.png | Bin 1156 -> 439 bytes res/drawable-hdpi/ic_hdr_plus_off_disabled.png | Bin 1335 -> 537 bytes res/drawable-hdpi/ic_hdr_plus_off_indicator.png | Bin 1204 -> 355 bytes res/drawable-hdpi/ic_hdr_plus_off_normal.png | Bin 1552 -> 496 bytes res/drawable-hdpi/ic_hdr_plus_on_disabled.png | Bin 1064 -> 465 bytes res/drawable-hdpi/ic_hdr_plus_on_indicator.png | Bin 1063 -> 342 bytes res/drawable-hdpi/ic_hdr_plus_on_normal.png | Bin 1269 -> 460 bytes res/drawable-hdpi/ic_panorama_disabled.png | Bin 1278 -> 0 bytes res/drawable-hdpi/ic_photo_sphere_disabled.png | Bin 1601 -> 0 bytes res/drawable-hdpi/ic_refocus_disabled.png | Bin 1095 -> 0 bytes res/drawable-hdpi/ic_share_disabled.png | Bin 1053 -> 408 bytes res/drawable-hdpi/ic_share_normal.png | Bin 1128 -> 329 bytes .../ic_switch_camera_back_disabled.png | Bin 1160 -> 395 bytes .../ic_switch_camera_back_indicator.png | Bin 0 -> 267 bytes res/drawable-hdpi/ic_switch_camera_back_normal.png | Bin 1377 -> 367 bytes .../ic_switch_camera_front_disabled.png | Bin 1296 -> 526 bytes .../ic_switch_camera_front_indicator.png | Bin 0 -> 334 bytes .../ic_switch_camera_front_normal.png | Bin 1552 -> 453 bytes res/drawable-hdpi/ic_timer_10s_disabled.png | Bin 1263 -> 630 bytes res/drawable-hdpi/ic_timer_10s_indicator.png | Bin 1181 -> 363 bytes res/drawable-hdpi/ic_timer_10s_normal.png | Bin 1521 -> 602 bytes res/drawable-hdpi/ic_timer_3s_disabled.png | Bin 1283 -> 608 bytes res/drawable-hdpi/ic_timer_3s_indicator.png | Bin 1155 -> 358 bytes res/drawable-hdpi/ic_timer_3s_normal.png | Bin 1498 -> 489 bytes res/drawable-hdpi/ic_timer_auto_disabled.png | Bin 0 -> 396 bytes res/drawable-hdpi/ic_timer_auto_indicator.png | Bin 0 -> 270 bytes res/drawable-hdpi/ic_timer_auto_normal.png | Bin 0 -> 353 bytes res/drawable-hdpi/ic_timer_off_disabled.png | Bin 1494 -> 697 bytes res/drawable-hdpi/ic_timer_off_indicator.png | Bin 1384 -> 414 bytes res/drawable-hdpi/ic_timer_off_normal.png | Bin 1695 -> 569 bytes res/drawable-hdpi/ic_trash_disabled.png | Bin 0 -> 293 bytes res/drawable-hdpi/ic_trash_normal.png | Bin 0 -> 279 bytes res/drawable-hdpi/ic_video_blanket.png | Bin 0 -> 570 bytes res/drawable-hdpi/ic_video_disabled.png | Bin 0 -> 360 bytes res/drawable-hdpi/ic_video_normal.png | Bin 0 -> 371 bytes res/drawable-mdpi/aspect_ratio_16x9_selected.png | Bin 5401 -> 25691 bytes res/drawable-mdpi/aspect_ratio_16x9_unselected.png | Bin 4539 -> 25126 bytes res/drawable-mdpi/aspect_ratio_4x3_selected.png | Bin 5240 -> 25393 bytes res/drawable-mdpi/aspect_ratio_4x3_unselected.png | Bin 4371 -> 24931 bytes res/drawable-mdpi/geo_opt_in_graphic.png | Bin 5995 -> 19494 bytes res/drawable-mdpi/ic_camera_blanket.png | Bin 0 -> 1052 bytes res/drawable-mdpi/ic_camera_disabled.png | Bin 765 -> 380 bytes res/drawable-mdpi/ic_camera_normal.png | Bin 0 -> 370 bytes res/drawable-mdpi/ic_capture_camera_disabled.png | Bin 0 -> 664 bytes res/drawable-mdpi/ic_capture_camera_normal.png | Bin 0 -> 732 bytes res/drawable-mdpi/ic_capture_video.png | Bin 0 -> 369 bytes res/drawable-mdpi/ic_capture_video_disabled.png | Bin 0 -> 374 bytes res/drawable-mdpi/ic_done_disabled.png | Bin 0 -> 691 bytes res/drawable-mdpi/ic_done_normal.png | Bin 0 -> 693 bytes res/drawable-mdpi/ic_edit_disabled.png | Bin 948 -> 318 bytes res/drawable-mdpi/ic_edit_normal.png | Bin 960 -> 223 bytes res/drawable-mdpi/ic_exposure_0.png | Bin 680 -> 286 bytes res/drawable-mdpi/ic_exposure_0_disabled.png | Bin 0 -> 323 bytes res/drawable-mdpi/ic_exposure_0_indicator.png | Bin 609 -> 231 bytes res/drawable-mdpi/ic_exposure_disabled.png | Bin 702 -> 376 bytes res/drawable-mdpi/ic_exposure_indicator.png | Bin 0 -> 303 bytes res/drawable-mdpi/ic_exposure_n1.png | Bin 636 -> 236 bytes res/drawable-mdpi/ic_exposure_n1_disabled.png | Bin 0 -> 274 bytes res/drawable-mdpi/ic_exposure_n1_indicator.png | Bin 563 -> 211 bytes res/drawable-mdpi/ic_exposure_n2.png | Bin 836 -> 331 bytes res/drawable-mdpi/ic_exposure_n2_disabled.png | Bin 0 -> 391 bytes res/drawable-mdpi/ic_exposure_n2_indicator.png | Bin 683 -> 286 bytes res/drawable-mdpi/ic_exposure_normal.png | Bin 846 -> 361 bytes res/drawable-mdpi/ic_exposure_p1.png | Bin 751 -> 251 bytes res/drawable-mdpi/ic_exposure_p1_disabled.png | Bin 0 -> 304 bytes res/drawable-mdpi/ic_exposure_p1_indicator.png | Bin 638 -> 263 bytes res/drawable-mdpi/ic_exposure_p2.png | Bin 916 -> 388 bytes res/drawable-mdpi/ic_exposure_p2_disabled.png | Bin 0 -> 410 bytes res/drawable-mdpi/ic_exposure_p2_indicator.png | Bin 771 -> 303 bytes res/drawable-mdpi/ic_flash_auto_disabled.png | Bin 771 -> 389 bytes res/drawable-mdpi/ic_flash_auto_indicator.png | Bin 771 -> 338 bytes res/drawable-mdpi/ic_flash_auto_normal.png | Bin 880 -> 352 bytes res/drawable-mdpi/ic_flash_off_disabled.png | Bin 786 -> 387 bytes res/drawable-mdpi/ic_flash_off_indicator.png | Bin 799 -> 303 bytes res/drawable-mdpi/ic_flash_off_normal.png | Bin 848 -> 299 bytes res/drawable-mdpi/ic_flash_on_disabled.png | Bin 704 -> 318 bytes res/drawable-mdpi/ic_flash_on_indicator.png | Bin 689 -> 250 bytes res/drawable-mdpi/ic_flash_on_normal.png | Bin 737 -> 273 bytes res/drawable-mdpi/ic_grid_off_disabled.png | Bin 911 -> 442 bytes res/drawable-mdpi/ic_grid_off_indicator.png | Bin 936 -> 344 bytes res/drawable-mdpi/ic_grid_off_normal.png | Bin 1150 -> 401 bytes res/drawable-mdpi/ic_grid_on_disabled.png | Bin 570 -> 295 bytes res/drawable-mdpi/ic_grid_on_indicator.png | Bin 748 -> 255 bytes res/drawable-mdpi/ic_grid_on_normal.png | Bin 725 -> 280 bytes res/drawable-mdpi/ic_hdr_off_disabled.png | Bin 935 -> 457 bytes res/drawable-mdpi/ic_hdr_off_indicator.png | Bin 856 -> 363 bytes res/drawable-mdpi/ic_hdr_off_normal.png | Bin 1032 -> 369 bytes res/drawable-mdpi/ic_hdr_on_disabled.png | Bin 746 -> 385 bytes res/drawable-mdpi/ic_hdr_on_indicator.png | Bin 726 -> 308 bytes res/drawable-mdpi/ic_hdr_on_normal.png | Bin 853 -> 358 bytes res/drawable-mdpi/ic_hdr_plus_off_disabled.png | Bin 980 -> 463 bytes res/drawable-mdpi/ic_hdr_plus_off_indicator.png | Bin 899 -> 322 bytes res/drawable-mdpi/ic_hdr_plus_off_normal.png | Bin 1115 -> 373 bytes res/drawable-mdpi/ic_hdr_plus_on_disabled.png | Bin 782 -> 356 bytes res/drawable-mdpi/ic_hdr_plus_on_indicator.png | Bin 757 -> 266 bytes res/drawable-mdpi/ic_hdr_plus_on_normal.png | Bin 947 -> 327 bytes res/drawable-mdpi/ic_panorama_disabled.png | Bin 876 -> 0 bytes res/drawable-mdpi/ic_refocus_disabled.png | Bin 787 -> 0 bytes res/drawable-mdpi/ic_share_disabled.png | Bin 803 -> 315 bytes res/drawable-mdpi/ic_share_normal.png | Bin 843 -> 266 bytes .../ic_switch_camera_back_disabled.png | Bin 822 -> 348 bytes .../ic_switch_camera_back_indicator.png | Bin 0 -> 244 bytes res/drawable-mdpi/ic_switch_camera_back_normal.png | Bin 982 -> 320 bytes .../ic_switch_camera_front_disabled.png | Bin 936 -> 443 bytes .../ic_switch_camera_front_indicator.png | Bin 0 -> 339 bytes .../ic_switch_camera_front_normal.png | Bin 1085 -> 438 bytes res/drawable-mdpi/ic_timer_10s_disabled.png | Bin 879 -> 477 bytes res/drawable-mdpi/ic_timer_10s_indicator.png | Bin 824 -> 318 bytes res/drawable-mdpi/ic_timer_10s_normal.png | Bin 1045 -> 424 bytes res/drawable-mdpi/ic_timer_3s_disabled.png | Bin 905 -> 497 bytes res/drawable-mdpi/ic_timer_3s_indicator.png | Bin 796 -> 292 bytes res/drawable-mdpi/ic_timer_3s_normal.png | Bin 1012 -> 357 bytes res/drawable-mdpi/ic_timer_auto_disabled.png | Bin 0 -> 334 bytes res/drawable-mdpi/ic_timer_auto_indicator.png | Bin 0 -> 254 bytes res/drawable-mdpi/ic_timer_auto_normal.png | Bin 0 -> 280 bytes res/drawable-mdpi/ic_timer_off_disabled.png | Bin 1062 -> 590 bytes res/drawable-mdpi/ic_timer_off_indicator.png | Bin 907 -> 382 bytes res/drawable-mdpi/ic_timer_off_normal.png | Bin 1081 -> 478 bytes res/drawable-mdpi/ic_trash_disabled.png | Bin 0 -> 210 bytes res/drawable-mdpi/ic_trash_normal.png | Bin 0 -> 201 bytes res/drawable-mdpi/ic_video_blanket.png | Bin 0 -> 405 bytes res/drawable-mdpi/ic_video_disabled.png | Bin 0 -> 283 bytes res/drawable-mdpi/ic_video_normal.png | Bin 0 -> 276 bytes res/drawable-xhdpi/aspect_ratio_16x9_selected.png | Bin 10619 -> 101152 bytes .../aspect_ratio_16x9_unselected.png | Bin 8903 -> 100645 bytes res/drawable-xhdpi/aspect_ratio_4x3_selected.png | Bin 9994 -> 98821 bytes res/drawable-xhdpi/aspect_ratio_4x3_unselected.png | Bin 8541 -> 99504 bytes res/drawable-xhdpi/geo_opt_in_graphic.png | Bin 12549 -> 68252 bytes res/drawable-xhdpi/ic_camera_blanket.png | Bin 0 -> 2257 bytes res/drawable-xhdpi/ic_camera_disabled.png | Bin 1406 -> 681 bytes res/drawable-xhdpi/ic_camera_normal.png | Bin 0 -> 582 bytes res/drawable-xhdpi/ic_capture_camera_disabled.png | Bin 0 -> 1139 bytes res/drawable-xhdpi/ic_capture_camera_normal.png | Bin 0 -> 1141 bytes res/drawable-xhdpi/ic_capture_video.png | Bin 0 -> 557 bytes res/drawable-xhdpi/ic_capture_video_disabled.png | Bin 0 -> 477 bytes res/drawable-xhdpi/ic_done_disabled.png | Bin 0 -> 1214 bytes res/drawable-xhdpi/ic_done_normal.png | Bin 0 -> 1114 bytes res/drawable-xhdpi/ic_edit_disabled.png | Bin 1825 -> 444 bytes res/drawable-xhdpi/ic_edit_normal.png | Bin 1921 -> 308 bytes res/drawable-xhdpi/ic_exposure_0.png | Bin 1273 -> 445 bytes res/drawable-xhdpi/ic_exposure_0_disabled.png | Bin 0 -> 503 bytes res/drawable-xhdpi/ic_exposure_0_indicator.png | Bin 983 -> 334 bytes res/drawable-xhdpi/ic_exposure_disabled.png | Bin 1018 -> 469 bytes res/drawable-xhdpi/ic_exposure_indicator.png | Bin 0 -> 405 bytes res/drawable-xhdpi/ic_exposure_n1.png | Bin 840 -> 292 bytes res/drawable-xhdpi/ic_exposure_n1_disabled.png | Bin 0 -> 301 bytes res/drawable-xhdpi/ic_exposure_n1_indicator.png | Bin 722 -> 291 bytes res/drawable-xhdpi/ic_exposure_n2.png | Bin 1498 -> 395 bytes res/drawable-xhdpi/ic_exposure_n2_disabled.png | Bin 0 -> 515 bytes res/drawable-xhdpi/ic_exposure_n2_indicator.png | Bin 1182 -> 368 bytes res/drawable-xhdpi/ic_exposure_normal.png | Bin 1244 -> 442 bytes res/drawable-xhdpi/ic_exposure_p1.png | Bin 1088 -> 312 bytes res/drawable-xhdpi/ic_exposure_p1_disabled.png | Bin 0 -> 328 bytes res/drawable-xhdpi/ic_exposure_p1_indicator.png | Bin 892 -> 324 bytes res/drawable-xhdpi/ic_exposure_p2.png | Bin 1722 -> 455 bytes res/drawable-xhdpi/ic_exposure_p2_disabled.png | Bin 0 -> 529 bytes res/drawable-xhdpi/ic_exposure_p2_indicator.png | Bin 1373 -> 425 bytes res/drawable-xhdpi/ic_flash_auto_disabled.png | Bin 1358 -> 597 bytes res/drawable-xhdpi/ic_flash_auto_indicator.png | Bin 1432 -> 468 bytes res/drawable-xhdpi/ic_flash_auto_normal.png | Bin 1593 -> 589 bytes res/drawable-xhdpi/ic_flash_off_disabled.png | Bin 1279 -> 563 bytes res/drawable-xhdpi/ic_flash_off_indicator.png | Bin 1280 -> 409 bytes res/drawable-xhdpi/ic_flash_off_normal.png | Bin 1381 -> 469 bytes res/drawable-xhdpi/ic_flash_on_disabled.png | Bin 1092 -> 378 bytes res/drawable-xhdpi/ic_flash_on_indicator.png | Bin 1087 -> 354 bytes res/drawable-xhdpi/ic_flash_on_normal.png | Bin 1245 -> 392 bytes res/drawable-xhdpi/ic_grid_off_disabled.png | Bin 1432 -> 644 bytes res/drawable-xhdpi/ic_grid_off_indicator.png | Bin 1770 -> 503 bytes res/drawable-xhdpi/ic_grid_off_normal.png | Bin 1871 -> 582 bytes res/drawable-xhdpi/ic_grid_on_disabled.png | Bin 766 -> 366 bytes res/drawable-xhdpi/ic_grid_on_indicator.png | Bin 1329 -> 297 bytes res/drawable-xhdpi/ic_grid_on_normal.png | Bin 950 -> 345 bytes res/drawable-xhdpi/ic_hdr_off_disabled.png | Bin 1664 -> 709 bytes res/drawable-xhdpi/ic_hdr_off_indicator.png | Bin 1540 -> 487 bytes res/drawable-xhdpi/ic_hdr_off_normal.png | Bin 1931 -> 614 bytes res/drawable-xhdpi/ic_hdr_on_disabled.png | Bin 1262 -> 524 bytes res/drawable-xhdpi/ic_hdr_on_indicator.png | Bin 1224 -> 444 bytes res/drawable-xhdpi/ic_hdr_on_normal.png | Bin 1548 -> 481 bytes res/drawable-xhdpi/ic_hdr_plus_off_disabled.png | Bin 1704 -> 610 bytes res/drawable-xhdpi/ic_hdr_plus_off_indicator.png | Bin 1656 -> 447 bytes res/drawable-xhdpi/ic_hdr_plus_off_normal.png | Bin 2073 -> 545 bytes res/drawable-xhdpi/ic_hdr_plus_on_disabled.png | Bin 1358 -> 516 bytes res/drawable-xhdpi/ic_hdr_plus_on_indicator.png | Bin 1361 -> 446 bytes res/drawable-xhdpi/ic_hdr_plus_on_normal.png | Bin 1716 -> 503 bytes res/drawable-xhdpi/ic_panorama_disabled.png | Bin 1582 -> 0 bytes res/drawable-xhdpi/ic_photo_sphere_disabled.png | Bin 2118 -> 0 bytes res/drawable-xhdpi/ic_refocus_disabled.png | Bin 1359 -> 0 bytes res/drawable-xhdpi/ic_share_disabled.png | Bin 1348 -> 490 bytes res/drawable-xhdpi/ic_share_normal.png | Bin 1463 -> 426 bytes .../ic_switch_camera_back_disabled.png | Bin 1517 -> 459 bytes .../ic_switch_camera_back_indicator.png | Bin 0 -> 359 bytes .../ic_switch_camera_back_normal.png | Bin 1770 -> 428 bytes .../ic_switch_camera_front_disabled.png | Bin 1700 -> 602 bytes .../ic_switch_camera_front_indicator.png | Bin 0 -> 457 bytes .../ic_switch_camera_front_normal.png | Bin 2069 -> 553 bytes res/drawable-xhdpi/ic_timer_10s_disabled.png | Bin 1810 -> 812 bytes res/drawable-xhdpi/ic_timer_10s_indicator.png | Bin 1600 -> 493 bytes res/drawable-xhdpi/ic_timer_10s_normal.png | Bin 2138 -> 676 bytes res/drawable-xhdpi/ic_timer_3s_disabled.png | Bin 1792 -> 783 bytes res/drawable-xhdpi/ic_timer_3s_indicator.png | Bin 1553 -> 420 bytes res/drawable-xhdpi/ic_timer_3s_normal.png | Bin 2061 -> 616 bytes res/drawable-xhdpi/ic_timer_auto_disabled.png | Bin 0 -> 471 bytes res/drawable-xhdpi/ic_timer_auto_indicator.png | Bin 0 -> 357 bytes res/drawable-xhdpi/ic_timer_auto_normal.png | Bin 0 -> 400 bytes res/drawable-xhdpi/ic_timer_off_disabled.png | Bin 1986 -> 832 bytes res/drawable-xhdpi/ic_timer_off_indicator.png | Bin 1798 -> 576 bytes res/drawable-xhdpi/ic_timer_off_normal.png | Bin 2270 -> 703 bytes res/drawable-xhdpi/ic_trash_disabled.png | Bin 0 -> 288 bytes res/drawable-xhdpi/ic_trash_normal.png | Bin 0 -> 254 bytes res/drawable-xhdpi/ic_video_blanket.png | Bin 0 -> 803 bytes res/drawable-xhdpi/ic_video_disabled.png | Bin 0 -> 362 bytes res/drawable-xhdpi/ic_video_normal.png | Bin 0 -> 342 bytes res/drawable-xxhdpi/aspect_ratio_16x9_selected.png | Bin 16270 -> 247971 bytes .../aspect_ratio_16x9_unselected.png | Bin 13709 -> 246085 bytes res/drawable-xxhdpi/aspect_ratio_4x3_selected.png | Bin 15428 -> 245147 bytes .../aspect_ratio_4x3_unselected.png | Bin 13056 -> 242131 bytes res/drawable-xxhdpi/geo_opt_in_graphic.png | Bin 15387 -> 157072 bytes res/drawable-xxhdpi/ic_camera_blanket.png | Bin 0 -> 3120 bytes res/drawable-xxhdpi/ic_camera_disabled.png | Bin 2152 -> 978 bytes res/drawable-xxhdpi/ic_camera_normal.png | Bin 0 -> 884 bytes res/drawable-xxhdpi/ic_capture_camera_disabled.png | Bin 0 -> 1933 bytes res/drawable-xxhdpi/ic_capture_camera_normal.png | Bin 0 -> 1944 bytes res/drawable-xxhdpi/ic_capture_video.png | Bin 0 -> 844 bytes res/drawable-xxhdpi/ic_capture_video_disabled.png | Bin 0 -> 726 bytes res/drawable-xxhdpi/ic_done_disabled.png | Bin 0 -> 1759 bytes res/drawable-xxhdpi/ic_done_normal.png | Bin 0 -> 1833 bytes res/drawable-xxhdpi/ic_edit_disabled.png | Bin 2691 -> 557 bytes res/drawable-xxhdpi/ic_edit_normal.png | Bin 2666 -> 420 bytes res/drawable-xxhdpi/ic_exposure_0.png | Bin 2038 -> 525 bytes res/drawable-xxhdpi/ic_exposure_0_disabled.png | Bin 0 -> 644 bytes res/drawable-xxhdpi/ic_exposure_0_indicator.png | Bin 1720 -> 448 bytes res/drawable-xxhdpi/ic_exposure_disabled.png | Bin 1494 -> 659 bytes res/drawable-xxhdpi/ic_exposure_indicator.png | Bin 0 -> 448 bytes res/drawable-xxhdpi/ic_exposure_n1.png | Bin 1335 -> 439 bytes res/drawable-xxhdpi/ic_exposure_n1_disabled.png | Bin 0 -> 382 bytes res/drawable-xxhdpi/ic_exposure_n1_indicator.png | Bin 1263 -> 297 bytes res/drawable-xxhdpi/ic_exposure_n2.png | Bin 2062 -> 664 bytes res/drawable-xxhdpi/ic_exposure_n2_disabled.png | Bin 0 -> 689 bytes res/drawable-xxhdpi/ic_exposure_n2_indicator.png | Bin 1803 -> 390 bytes res/drawable-xxhdpi/ic_exposure_normal.png | Bin 1520 -> 596 bytes res/drawable-xxhdpi/ic_exposure_p1.png | Bin 1420 -> 372 bytes res/drawable-xxhdpi/ic_exposure_p1_disabled.png | Bin 0 -> 452 bytes res/drawable-xxhdpi/ic_exposure_p1_indicator.png | Bin 1358 -> 321 bytes res/drawable-xxhdpi/ic_exposure_p2.png | Bin 2153 -> 642 bytes res/drawable-xxhdpi/ic_exposure_p2_disabled.png | Bin 0 -> 704 bytes res/drawable-xxhdpi/ic_exposure_p2_indicator.png | Bin 1857 -> 461 bytes res/drawable-xxhdpi/ic_flash_auto_disabled.png | Bin 2033 -> 842 bytes res/drawable-xxhdpi/ic_flash_auto_indicator.png | Bin 2064 -> 601 bytes res/drawable-xxhdpi/ic_flash_auto_normal.png | Bin 2266 -> 862 bytes res/drawable-xxhdpi/ic_flash_off_disabled.png | Bin 1955 -> 738 bytes res/drawable-xxhdpi/ic_flash_off_indicator.png | Bin 1803 -> 476 bytes res/drawable-xxhdpi/ic_flash_off_normal.png | Bin 2102 -> 579 bytes res/drawable-xxhdpi/ic_flash_on_disabled.png | Bin 1762 -> 495 bytes res/drawable-xxhdpi/ic_flash_on_indicator.png | Bin 1815 -> 389 bytes res/drawable-xxhdpi/ic_flash_on_normal.png | Bin 1987 -> 510 bytes res/drawable-xxhdpi/ic_grid_off_disabled.png | Bin 1741 -> 814 bytes res/drawable-xxhdpi/ic_grid_off_indicator.png | Bin 1810 -> 586 bytes res/drawable-xxhdpi/ic_grid_off_normal.png | Bin 1736 -> 786 bytes res/drawable-xxhdpi/ic_grid_on_disabled.png | Bin 1246 -> 463 bytes res/drawable-xxhdpi/ic_grid_on_indicator.png | Bin 1418 -> 327 bytes res/drawable-xxhdpi/ic_grid_on_normal.png | Bin 1238 -> 483 bytes res/drawable-xxhdpi/ic_hdr_off_disabled.png | Bin 2122 -> 942 bytes res/drawable-xxhdpi/ic_hdr_off_indicator.png | Bin 2011 -> 596 bytes res/drawable-xxhdpi/ic_hdr_off_normal.png | Bin 2154 -> 849 bytes res/drawable-xxhdpi/ic_hdr_on_disabled.png | Bin 1843 -> 707 bytes res/drawable-xxhdpi/ic_hdr_on_indicator.png | Bin 1751 -> 496 bytes res/drawable-xxhdpi/ic_hdr_on_normal.png | Bin 1942 -> 753 bytes res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png | Bin 2227 -> 813 bytes res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png | Bin 1956 -> 549 bytes res/drawable-xxhdpi/ic_hdr_plus_off_normal.png | Bin 2287 -> 716 bytes res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png | Bin 1924 -> 685 bytes res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png | Bin 1817 -> 511 bytes res/drawable-xxhdpi/ic_hdr_plus_on_normal.png | Bin 2042 -> 744 bytes res/drawable-xxhdpi/ic_panorama_disabled.png | Bin 2130 -> 0 bytes res/drawable-xxhdpi/ic_photo_sphere_disabled.png | Bin 3032 -> 0 bytes res/drawable-xxhdpi/ic_refocus_disabled.png | Bin 2102 -> 1564 bytes res/drawable-xxhdpi/ic_refocus_normal.png | Bin 0 -> 1171 bytes res/drawable-xxhdpi/ic_share_disabled.png | Bin 2074 -> 656 bytes res/drawable-xxhdpi/ic_share_normal.png | Bin 2240 -> 591 bytes .../ic_switch_camera_back_disabled.png | Bin 2311 -> 585 bytes .../ic_switch_camera_back_indicator.png | Bin 0 -> 439 bytes .../ic_switch_camera_back_normal.png | Bin 2502 -> 600 bytes .../ic_switch_camera_front_disabled.png | Bin 2456 -> 825 bytes .../ic_switch_camera_front_indicator.png | Bin 0 -> 561 bytes .../ic_switch_camera_front_normal.png | Bin 2692 -> 796 bytes res/drawable-xxhdpi/ic_timer_10s_disabled.png | Bin 2639 -> 1137 bytes res/drawable-xxhdpi/ic_timer_10s_indicator.png | Bin 2288 -> 685 bytes res/drawable-xxhdpi/ic_timer_10s_normal.png | Bin 2746 -> 1007 bytes res/drawable-xxhdpi/ic_timer_3s_disabled.png | Bin 2656 -> 1102 bytes res/drawable-xxhdpi/ic_timer_3s_indicator.png | Bin 2221 -> 629 bytes res/drawable-xxhdpi/ic_timer_3s_normal.png | Bin 2737 -> 1012 bytes res/drawable-xxhdpi/ic_timer_auto_disabled.png | Bin 0 -> 754 bytes res/drawable-xxhdpi/ic_timer_auto_indicator.png | Bin 0 -> 405 bytes res/drawable-xxhdpi/ic_timer_auto_normal.png | Bin 0 -> 571 bytes res/drawable-xxhdpi/ic_timer_off_disabled.png | Bin 2565 -> 1182 bytes res/drawable-xxhdpi/ic_timer_off_indicator.png | Bin 2216 -> 712 bytes res/drawable-xxhdpi/ic_timer_off_normal.png | Bin 2658 -> 1011 bytes res/drawable-xxhdpi/ic_trash_disabled.png | Bin 0 -> 363 bytes res/drawable-xxhdpi/ic_trash_normal.png | Bin 0 -> 349 bytes res/drawable-xxhdpi/ic_video_blanket.png | Bin 0 -> 1719 bytes res/drawable-xxhdpi/ic_video_disabled.png | Bin 0 -> 428 bytes res/drawable-xxhdpi/ic_video_normal.png | Bin 0 -> 438 bytes .../aspect_ratio_16x9_selected.png | Bin 0 -> 138788 bytes .../aspect_ratio_16x9_unselected.png | Bin 0 -> 144582 bytes res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png | Bin 0 -> 123338 bytes .../aspect_ratio_4x3_unselected.png | Bin 0 -> 140330 bytes res/drawable-xxxhdpi/geo_opt_in_graphic.png | Bin 0 -> 85147 bytes res/drawable-xxxhdpi/ic_camera_blanket.png | Bin 0 -> 4520 bytes res/drawable-xxxhdpi/ic_camera_disabled.png | Bin 0 -> 1297 bytes res/drawable-xxxhdpi/ic_camera_normal.png | Bin 0 -> 1176 bytes .../ic_capture_camera_disabled.png | Bin 0 -> 2730 bytes res/drawable-xxxhdpi/ic_capture_camera_normal.png | Bin 0 -> 2795 bytes res/drawable-xxxhdpi/ic_capture_pano.png | Bin 0 -> 4163 bytes res/drawable-xxxhdpi/ic_capture_pano_disabled.png | Bin 0 -> 4167 bytes res/drawable-xxxhdpi/ic_capture_refocus.png | Bin 0 -> 4166 bytes .../ic_capture_refocus_disabled.png | Bin 0 -> 4209 bytes res/drawable-xxxhdpi/ic_capture_video.png | Bin 0 -> 1369 bytes res/drawable-xxxhdpi/ic_capture_video_disabled.png | Bin 0 -> 1015 bytes res/drawable-xxxhdpi/ic_edit_disabled.png | Bin 0 -> 649 bytes res/drawable-xxxhdpi/ic_edit_normal.png | Bin 0 -> 490 bytes res/drawable-xxxhdpi/ic_exposure_0.png | Bin 0 -> 710 bytes res/drawable-xxxhdpi/ic_exposure_0_disabled.png | Bin 0 -> 855 bytes res/drawable-xxxhdpi/ic_exposure_0_indicator.png | Bin 0 -> 533 bytes res/drawable-xxxhdpi/ic_exposure_disabled.png | Bin 0 -> 711 bytes res/drawable-xxxhdpi/ic_exposure_indicator.png | Bin 0 -> 588 bytes res/drawable-xxxhdpi/ic_exposure_n1.png | Bin 0 -> 430 bytes res/drawable-xxxhdpi/ic_exposure_n1_disabled.png | Bin 0 -> 422 bytes res/drawable-xxxhdpi/ic_exposure_n1_indicator.png | Bin 0 -> 379 bytes res/drawable-xxxhdpi/ic_exposure_n2.png | Bin 0 -> 702 bytes res/drawable-xxxhdpi/ic_exposure_n2_disabled.png | Bin 0 -> 867 bytes res/drawable-xxxhdpi/ic_exposure_n2_indicator.png | Bin 0 -> 576 bytes res/drawable-xxxhdpi/ic_exposure_normal.png | Bin 0 -> 691 bytes res/drawable-xxxhdpi/ic_exposure_p1.png | Bin 0 -> 459 bytes res/drawable-xxxhdpi/ic_exposure_p1_disabled.png | Bin 0 -> 460 bytes res/drawable-xxxhdpi/ic_exposure_p1_indicator.png | Bin 0 -> 457 bytes res/drawable-xxxhdpi/ic_exposure_p2.png | Bin 0 -> 792 bytes res/drawable-xxxhdpi/ic_exposure_p2_disabled.png | Bin 0 -> 901 bytes res/drawable-xxxhdpi/ic_exposure_p2_indicator.png | Bin 0 -> 659 bytes res/drawable-xxxhdpi/ic_flash_auto_disabled.png | Bin 0 -> 1031 bytes res/drawable-xxxhdpi/ic_flash_auto_indicator.png | Bin 0 -> 845 bytes res/drawable-xxxhdpi/ic_flash_auto_normal.png | Bin 0 -> 1040 bytes res/drawable-xxxhdpi/ic_flash_off_disabled.png | Bin 0 -> 910 bytes res/drawable-xxxhdpi/ic_flash_off_indicator.png | Bin 0 -> 665 bytes res/drawable-xxxhdpi/ic_flash_off_normal.png | Bin 0 -> 788 bytes res/drawable-xxxhdpi/ic_flash_on_disabled.png | Bin 0 -> 581 bytes res/drawable-xxxhdpi/ic_flash_on_indicator.png | Bin 0 -> 524 bytes res/drawable-xxxhdpi/ic_flash_on_normal.png | Bin 0 -> 600 bytes res/drawable-xxxhdpi/ic_grid_off_disabled.png | Bin 0 -> 942 bytes res/drawable-xxxhdpi/ic_grid_off_indicator.png | Bin 0 -> 772 bytes res/drawable-xxxhdpi/ic_grid_off_normal.png | Bin 0 -> 919 bytes res/drawable-xxxhdpi/ic_grid_on_disabled.png | Bin 0 -> 597 bytes res/drawable-xxxhdpi/ic_grid_on_indicator.png | Bin 0 -> 450 bytes res/drawable-xxxhdpi/ic_grid_on_normal.png | Bin 0 -> 585 bytes res/drawable-xxxhdpi/ic_hdr_off_disabled.png | Bin 0 -> 1168 bytes res/drawable-xxxhdpi/ic_hdr_off_indicator.png | Bin 0 -> 784 bytes res/drawable-xxxhdpi/ic_hdr_off_normal.png | Bin 0 -> 1076 bytes res/drawable-xxxhdpi/ic_hdr_on_disabled.png | Bin 0 -> 868 bytes res/drawable-xxxhdpi/ic_hdr_on_indicator.png | Bin 0 -> 682 bytes res/drawable-xxxhdpi/ic_hdr_on_normal.png | Bin 0 -> 807 bytes res/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png | Bin 0 -> 998 bytes res/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png | Bin 0 -> 718 bytes res/drawable-xxxhdpi/ic_hdr_plus_off_normal.png | Bin 0 -> 889 bytes res/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png | Bin 0 -> 869 bytes res/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png | Bin 0 -> 662 bytes res/drawable-xxxhdpi/ic_hdr_plus_on_normal.png | Bin 0 -> 836 bytes res/drawable-xxxhdpi/ic_share_disabled.png | Bin 0 -> 807 bytes res/drawable-xxxhdpi/ic_share_normal.png | Bin 0 -> 751 bytes .../ic_switch_camera_back_disabled.png | Bin 0 -> 760 bytes .../ic_switch_camera_back_indicator.png | Bin 0 -> 649 bytes .../ic_switch_camera_back_normal.png | Bin 0 -> 818 bytes .../ic_switch_camera_front_disabled.png | Bin 0 -> 1041 bytes .../ic_switch_camera_front_indicator.png | Bin 0 -> 800 bytes .../ic_switch_camera_front_normal.png | Bin 0 -> 1043 bytes res/drawable-xxxhdpi/ic_timer_10s_disabled.png | Bin 0 -> 1527 bytes res/drawable-xxxhdpi/ic_timer_10s_indicator.png | Bin 0 -> 890 bytes res/drawable-xxxhdpi/ic_timer_10s_normal.png | Bin 0 -> 1312 bytes res/drawable-xxxhdpi/ic_timer_3s_disabled.png | Bin 0 -> 1454 bytes res/drawable-xxxhdpi/ic_timer_3s_indicator.png | Bin 0 -> 798 bytes res/drawable-xxxhdpi/ic_timer_3s_normal.png | Bin 0 -> 1160 bytes res/drawable-xxxhdpi/ic_timer_auto_disabled.png | Bin 0 -> 808 bytes res/drawable-xxxhdpi/ic_timer_auto_indicator.png | Bin 0 -> 571 bytes res/drawable-xxxhdpi/ic_timer_auto_normal.png | Bin 0 -> 763 bytes res/drawable-xxxhdpi/ic_timer_off_disabled.png | Bin 0 -> 1650 bytes res/drawable-xxxhdpi/ic_timer_off_indicator.png | Bin 0 -> 977 bytes res/drawable-xxxhdpi/ic_timer_off_normal.png | Bin 0 -> 1382 bytes res/drawable-xxxhdpi/ic_trash_disabled.png | Bin 0 -> 433 bytes res/drawable-xxxhdpi/ic_trash_normal.png | Bin 0 -> 405 bytes res/drawable-xxxhdpi/ic_video_blanket.png | Bin 0 -> 2074 bytes res/drawable-xxxhdpi/ic_video_disabled.png | Bin 0 -> 541 bytes res/drawable-xxxhdpi/ic_video_normal.png | Bin 0 -> 581 bytes res/drawable/ic_camera.xml | 29 +++++++++++++++++++++ res/drawable/ic_capture_camera.xml | 29 +++++++++++++++++++++ res/drawable/ic_capture_panorama.xml | 29 +++++++++++++++++++++ res/drawable/ic_capture_refocus.xml | 29 +++++++++++++++++++++ res/drawable/ic_capture_video.xml | 29 +++++++++++++++++++++ res/drawable/ic_refocus.xml | 29 +++++++++++++++++++++ res/layout-land/location_dialog_content.xml | 12 ++++----- res/values/arrays.xml | 14 +++++----- res/values/colors.xml | 4 +-- res_p/drawable-hdpi/ic_camera_blanket.png | Bin 3697 -> 0 bytes res_p/drawable-hdpi/ic_camera_normal.png | Bin 1342 -> 0 bytes res_p/drawable-hdpi/ic_panorama_disabled.png | Bin 0 -> 1518 bytes res_p/drawable-hdpi/ic_photo_sphere_blanket.png | Bin 5849 -> 0 bytes res_p/drawable-hdpi/ic_photo_sphere_normal.png | Bin 1847 -> 0 bytes res_p/drawable-hdpi/ic_photosphere_blanket.png | Bin 0 -> 5849 bytes res_p/drawable-hdpi/ic_photosphere_disabled.png | Bin 0 -> 1847 bytes res_p/drawable-hdpi/ic_photosphere_normal.png | Bin 0 -> 1847 bytes res_p/drawable-hdpi/ic_refocus_disabled.png | Bin 0 -> 1211 bytes res_p/drawable-hdpi/ic_video_blanket.png | Bin 1663 -> 0 bytes res_p/drawable-hdpi/ic_video_disabled.png | Bin 658 -> 0 bytes res_p/drawable-hdpi/ic_video_normal.png | Bin 763 -> 0 bytes res_p/drawable-mdpi/ic_camera_blanket.png | Bin 2434 -> 0 bytes res_p/drawable-mdpi/ic_camera_normal.png | Bin 934 -> 0 bytes res_p/drawable-mdpi/ic_panorama_disabled.png | Bin 0 -> 1056 bytes res_p/drawable-mdpi/ic_photo_sphere_blanket.png | Bin 3673 -> 0 bytes res_p/drawable-mdpi/ic_photo_sphere_normal.png | Bin 1234 -> 0 bytes res_p/drawable-mdpi/ic_photosphere_blanket.png | Bin 0 -> 3673 bytes res_p/drawable-mdpi/ic_photosphere_disabled.png | Bin 0 -> 1234 bytes res_p/drawable-mdpi/ic_photosphere_normal.png | Bin 0 -> 1234 bytes res_p/drawable-mdpi/ic_refocus_disabled.png | Bin 0 -> 889 bytes res_p/drawable-mdpi/ic_video_blanket.png | Bin 1289 -> 0 bytes res_p/drawable-mdpi/ic_video_disabled.png | Bin 547 -> 0 bytes res_p/drawable-mdpi/ic_video_normal.png | Bin 650 -> 0 bytes res_p/drawable-xhdpi/ic_camera_blanket.png | Bin 5052 -> 0 bytes res_p/drawable-xhdpi/ic_camera_normal.png | Bin 1714 -> 0 bytes res_p/drawable-xhdpi/ic_panorama_disabled.png | Bin 0 -> 1825 bytes res_p/drawable-xhdpi/ic_photo_sphere_blanket.png | Bin 8402 -> 0 bytes res_p/drawable-xhdpi/ic_photo_sphere_normal.png | Bin 2520 -> 0 bytes res_p/drawable-xhdpi/ic_photosphere_blanket.png | Bin 0 -> 8402 bytes res_p/drawable-xhdpi/ic_photosphere_disabled.png | Bin 0 -> 2520 bytes res_p/drawable-xhdpi/ic_photosphere_normal.png | Bin 0 -> 2520 bytes res_p/drawable-xhdpi/ic_refocus_disabled.png | Bin 0 -> 1558 bytes res_p/drawable-xhdpi/ic_video_blanket.png | Bin 2133 -> 0 bytes res_p/drawable-xhdpi/ic_video_disabled.png | Bin 809 -> 0 bytes res_p/drawable-xhdpi/ic_video_normal.png | Bin 944 -> 0 bytes res_p/drawable-xxhdpi/ic_camera_blanket.png | Bin 5640 -> 0 bytes res_p/drawable-xxhdpi/ic_camera_normal.png | Bin 2360 -> 0 bytes res_p/drawable-xxhdpi/ic_panorama_disabled.png | Bin 0 -> 2115 bytes res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png | Bin 9343 -> 0 bytes res_p/drawable-xxhdpi/ic_photo_sphere_normal.png | Bin 3248 -> 0 bytes res_p/drawable-xxhdpi/ic_photosphere_blanket.png | Bin 0 -> 9343 bytes res_p/drawable-xxhdpi/ic_photosphere_disabled.png | Bin 0 -> 3248 bytes res_p/drawable-xxhdpi/ic_photosphere_normal.png | Bin 0 -> 3248 bytes res_p/drawable-xxhdpi/ic_refocus_disabled.png | Bin 0 -> 2295 bytes res_p/drawable-xxhdpi/ic_video_blanket.png | Bin 3234 -> 0 bytes res_p/drawable-xxhdpi/ic_video_disabled.png | Bin 1487 -> 0 bytes res_p/drawable-xxhdpi/ic_video_normal.png | Bin 1536 -> 0 bytes res_p/drawable/ic_camera.xml | 29 --------------------- res_p/drawable/ic_refocus.xml | 29 --------------------- 503 files changed, 189 insertions(+), 73 deletions(-) create mode 100644 res/drawable-hdpi/ic_camera_blanket.png create mode 100644 res/drawable-hdpi/ic_camera_normal.png create mode 100644 res/drawable-hdpi/ic_capture_camera_disabled.png create mode 100644 res/drawable-hdpi/ic_capture_camera_normal.png create mode 100644 res/drawable-hdpi/ic_capture_video.png create mode 100644 res/drawable-hdpi/ic_capture_video_disabled.png create mode 100644 res/drawable-hdpi/ic_done_disabled.png create mode 100644 res/drawable-hdpi/ic_done_normal.png create mode 100644 res/drawable-hdpi/ic_exposure_0_disabled.png create mode 100644 res/drawable-hdpi/ic_exposure_indicator.png create mode 100644 res/drawable-hdpi/ic_exposure_n1_disabled.png create mode 100644 res/drawable-hdpi/ic_exposure_n2_disabled.png create mode 100644 res/drawable-hdpi/ic_exposure_p1_disabled.png create mode 100644 res/drawable-hdpi/ic_exposure_p2_disabled.png delete mode 100644 res/drawable-hdpi/ic_panorama_disabled.png delete mode 100644 res/drawable-hdpi/ic_photo_sphere_disabled.png delete mode 100644 res/drawable-hdpi/ic_refocus_disabled.png create mode 100644 res/drawable-hdpi/ic_switch_camera_back_indicator.png create mode 100644 res/drawable-hdpi/ic_switch_camera_front_indicator.png create mode 100644 res/drawable-hdpi/ic_timer_auto_disabled.png create mode 100644 res/drawable-hdpi/ic_timer_auto_indicator.png create mode 100644 res/drawable-hdpi/ic_timer_auto_normal.png create mode 100644 res/drawable-hdpi/ic_trash_disabled.png create mode 100644 res/drawable-hdpi/ic_trash_normal.png create mode 100644 res/drawable-hdpi/ic_video_blanket.png create mode 100644 res/drawable-hdpi/ic_video_disabled.png create mode 100644 res/drawable-hdpi/ic_video_normal.png create mode 100644 res/drawable-mdpi/ic_camera_blanket.png create mode 100644 res/drawable-mdpi/ic_camera_normal.png create mode 100644 res/drawable-mdpi/ic_capture_camera_disabled.png create mode 100644 res/drawable-mdpi/ic_capture_camera_normal.png create mode 100644 res/drawable-mdpi/ic_capture_video.png create mode 100644 res/drawable-mdpi/ic_capture_video_disabled.png create mode 100644 res/drawable-mdpi/ic_done_disabled.png create mode 100644 res/drawable-mdpi/ic_done_normal.png create mode 100644 res/drawable-mdpi/ic_exposure_0_disabled.png create mode 100644 res/drawable-mdpi/ic_exposure_indicator.png create mode 100644 res/drawable-mdpi/ic_exposure_n1_disabled.png create mode 100644 res/drawable-mdpi/ic_exposure_n2_disabled.png create mode 100644 res/drawable-mdpi/ic_exposure_p1_disabled.png create mode 100644 res/drawable-mdpi/ic_exposure_p2_disabled.png delete mode 100644 res/drawable-mdpi/ic_panorama_disabled.png delete mode 100644 res/drawable-mdpi/ic_refocus_disabled.png create mode 100644 res/drawable-mdpi/ic_switch_camera_back_indicator.png create mode 100644 res/drawable-mdpi/ic_switch_camera_front_indicator.png create mode 100644 res/drawable-mdpi/ic_timer_auto_disabled.png create mode 100644 res/drawable-mdpi/ic_timer_auto_indicator.png create mode 100644 res/drawable-mdpi/ic_timer_auto_normal.png create mode 100644 res/drawable-mdpi/ic_trash_disabled.png create mode 100644 res/drawable-mdpi/ic_trash_normal.png create mode 100644 res/drawable-mdpi/ic_video_blanket.png create mode 100644 res/drawable-mdpi/ic_video_disabled.png create mode 100644 res/drawable-mdpi/ic_video_normal.png create mode 100644 res/drawable-xhdpi/ic_camera_blanket.png create mode 100644 res/drawable-xhdpi/ic_camera_normal.png create mode 100644 res/drawable-xhdpi/ic_capture_camera_disabled.png create mode 100644 res/drawable-xhdpi/ic_capture_camera_normal.png create mode 100644 res/drawable-xhdpi/ic_capture_video.png create mode 100644 res/drawable-xhdpi/ic_capture_video_disabled.png create mode 100644 res/drawable-xhdpi/ic_done_disabled.png create mode 100644 res/drawable-xhdpi/ic_done_normal.png create mode 100644 res/drawable-xhdpi/ic_exposure_0_disabled.png create mode 100644 res/drawable-xhdpi/ic_exposure_indicator.png create mode 100644 res/drawable-xhdpi/ic_exposure_n1_disabled.png create mode 100644 res/drawable-xhdpi/ic_exposure_n2_disabled.png create mode 100644 res/drawable-xhdpi/ic_exposure_p1_disabled.png create mode 100644 res/drawable-xhdpi/ic_exposure_p2_disabled.png delete mode 100644 res/drawable-xhdpi/ic_panorama_disabled.png delete mode 100644 res/drawable-xhdpi/ic_photo_sphere_disabled.png delete mode 100644 res/drawable-xhdpi/ic_refocus_disabled.png create mode 100644 res/drawable-xhdpi/ic_switch_camera_back_indicator.png create mode 100644 res/drawable-xhdpi/ic_switch_camera_front_indicator.png create mode 100644 res/drawable-xhdpi/ic_timer_auto_disabled.png create mode 100644 res/drawable-xhdpi/ic_timer_auto_indicator.png create mode 100644 res/drawable-xhdpi/ic_timer_auto_normal.png create mode 100644 res/drawable-xhdpi/ic_trash_disabled.png create mode 100644 res/drawable-xhdpi/ic_trash_normal.png create mode 100644 res/drawable-xhdpi/ic_video_blanket.png create mode 100644 res/drawable-xhdpi/ic_video_disabled.png create mode 100644 res/drawable-xhdpi/ic_video_normal.png create mode 100644 res/drawable-xxhdpi/ic_camera_blanket.png create mode 100644 res/drawable-xxhdpi/ic_camera_normal.png create mode 100644 res/drawable-xxhdpi/ic_capture_camera_disabled.png create mode 100644 res/drawable-xxhdpi/ic_capture_camera_normal.png create mode 100644 res/drawable-xxhdpi/ic_capture_video.png create mode 100644 res/drawable-xxhdpi/ic_capture_video_disabled.png create mode 100644 res/drawable-xxhdpi/ic_done_disabled.png create mode 100644 res/drawable-xxhdpi/ic_done_normal.png create mode 100644 res/drawable-xxhdpi/ic_exposure_0_disabled.png create mode 100644 res/drawable-xxhdpi/ic_exposure_indicator.png create mode 100644 res/drawable-xxhdpi/ic_exposure_n1_disabled.png create mode 100644 res/drawable-xxhdpi/ic_exposure_n2_disabled.png create mode 100644 res/drawable-xxhdpi/ic_exposure_p1_disabled.png create mode 100644 res/drawable-xxhdpi/ic_exposure_p2_disabled.png delete mode 100644 res/drawable-xxhdpi/ic_panorama_disabled.png delete mode 100644 res/drawable-xxhdpi/ic_photo_sphere_disabled.png create mode 100644 res/drawable-xxhdpi/ic_refocus_normal.png create mode 100644 res/drawable-xxhdpi/ic_switch_camera_back_indicator.png create mode 100644 res/drawable-xxhdpi/ic_switch_camera_front_indicator.png create mode 100644 res/drawable-xxhdpi/ic_timer_auto_disabled.png create mode 100644 res/drawable-xxhdpi/ic_timer_auto_indicator.png create mode 100644 res/drawable-xxhdpi/ic_timer_auto_normal.png create mode 100644 res/drawable-xxhdpi/ic_trash_disabled.png create mode 100644 res/drawable-xxhdpi/ic_trash_normal.png create mode 100644 res/drawable-xxhdpi/ic_video_blanket.png create mode 100644 res/drawable-xxhdpi/ic_video_disabled.png create mode 100644 res/drawable-xxhdpi/ic_video_normal.png create mode 100644 res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png create mode 100644 res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png create mode 100644 res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png create mode 100644 res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png create mode 100644 res/drawable-xxxhdpi/geo_opt_in_graphic.png create mode 100644 res/drawable-xxxhdpi/ic_camera_blanket.png create mode 100644 res/drawable-xxxhdpi/ic_camera_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_camera_normal.png create mode 100644 res/drawable-xxxhdpi/ic_capture_camera_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_capture_camera_normal.png create mode 100644 res/drawable-xxxhdpi/ic_capture_pano.png create mode 100644 res/drawable-xxxhdpi/ic_capture_pano_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_capture_refocus.png create mode 100644 res/drawable-xxxhdpi/ic_capture_refocus_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_capture_video.png create mode 100644 res/drawable-xxxhdpi/ic_capture_video_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_edit_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_edit_normal.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_0.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_0_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_0_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n1.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n1_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n1_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n2.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n2_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_n2_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_normal.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p1.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p1_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p1_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p2.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p2_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_exposure_p2_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_flash_auto_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_flash_auto_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_flash_auto_normal.png create mode 100644 res/drawable-xxxhdpi/ic_flash_off_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_flash_off_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_flash_off_normal.png create mode 100644 res/drawable-xxxhdpi/ic_flash_on_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_flash_on_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_flash_on_normal.png create mode 100644 res/drawable-xxxhdpi/ic_grid_off_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_grid_off_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_grid_off_normal.png create mode 100644 res/drawable-xxxhdpi/ic_grid_on_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_grid_on_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_grid_on_normal.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_off_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_off_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_off_normal.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_on_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_on_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_on_normal.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_off_normal.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_hdr_plus_on_normal.png create mode 100644 res/drawable-xxxhdpi/ic_share_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_share_normal.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_back_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_back_normal.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_front_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_switch_camera_front_normal.png create mode 100644 res/drawable-xxxhdpi/ic_timer_10s_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_timer_10s_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_timer_10s_normal.png create mode 100644 res/drawable-xxxhdpi/ic_timer_3s_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_timer_3s_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_timer_3s_normal.png create mode 100644 res/drawable-xxxhdpi/ic_timer_auto_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_timer_auto_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_timer_auto_normal.png create mode 100644 res/drawable-xxxhdpi/ic_timer_off_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_timer_off_indicator.png create mode 100644 res/drawable-xxxhdpi/ic_timer_off_normal.png create mode 100644 res/drawable-xxxhdpi/ic_trash_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_trash_normal.png create mode 100644 res/drawable-xxxhdpi/ic_video_blanket.png create mode 100644 res/drawable-xxxhdpi/ic_video_disabled.png create mode 100644 res/drawable-xxxhdpi/ic_video_normal.png create mode 100644 res/drawable/ic_camera.xml create mode 100644 res/drawable/ic_capture_camera.xml create mode 100644 res/drawable/ic_capture_panorama.xml create mode 100644 res/drawable/ic_capture_refocus.xml create mode 100644 res/drawable/ic_capture_video.xml create mode 100644 res/drawable/ic_refocus.xml delete mode 100644 res_p/drawable-hdpi/ic_camera_blanket.png delete mode 100644 res_p/drawable-hdpi/ic_camera_normal.png create mode 100644 res_p/drawable-hdpi/ic_panorama_disabled.png delete mode 100644 res_p/drawable-hdpi/ic_photo_sphere_blanket.png delete mode 100644 res_p/drawable-hdpi/ic_photo_sphere_normal.png create mode 100644 res_p/drawable-hdpi/ic_photosphere_blanket.png create mode 100644 res_p/drawable-hdpi/ic_photosphere_disabled.png create mode 100644 res_p/drawable-hdpi/ic_photosphere_normal.png create mode 100644 res_p/drawable-hdpi/ic_refocus_disabled.png delete mode 100644 res_p/drawable-hdpi/ic_video_blanket.png delete mode 100644 res_p/drawable-hdpi/ic_video_disabled.png delete mode 100644 res_p/drawable-hdpi/ic_video_normal.png delete mode 100644 res_p/drawable-mdpi/ic_camera_blanket.png delete mode 100644 res_p/drawable-mdpi/ic_camera_normal.png create mode 100644 res_p/drawable-mdpi/ic_panorama_disabled.png delete mode 100644 res_p/drawable-mdpi/ic_photo_sphere_blanket.png delete mode 100644 res_p/drawable-mdpi/ic_photo_sphere_normal.png create mode 100644 res_p/drawable-mdpi/ic_photosphere_blanket.png create mode 100644 res_p/drawable-mdpi/ic_photosphere_disabled.png create mode 100644 res_p/drawable-mdpi/ic_photosphere_normal.png create mode 100644 res_p/drawable-mdpi/ic_refocus_disabled.png delete mode 100644 res_p/drawable-mdpi/ic_video_blanket.png delete mode 100644 res_p/drawable-mdpi/ic_video_disabled.png delete mode 100644 res_p/drawable-mdpi/ic_video_normal.png delete mode 100644 res_p/drawable-xhdpi/ic_camera_blanket.png delete mode 100644 res_p/drawable-xhdpi/ic_camera_normal.png create mode 100644 res_p/drawable-xhdpi/ic_panorama_disabled.png delete mode 100644 res_p/drawable-xhdpi/ic_photo_sphere_blanket.png delete mode 100644 res_p/drawable-xhdpi/ic_photo_sphere_normal.png create mode 100644 res_p/drawable-xhdpi/ic_photosphere_blanket.png create mode 100644 res_p/drawable-xhdpi/ic_photosphere_disabled.png create mode 100644 res_p/drawable-xhdpi/ic_photosphere_normal.png create mode 100644 res_p/drawable-xhdpi/ic_refocus_disabled.png delete mode 100644 res_p/drawable-xhdpi/ic_video_blanket.png delete mode 100644 res_p/drawable-xhdpi/ic_video_disabled.png delete mode 100644 res_p/drawable-xhdpi/ic_video_normal.png delete mode 100644 res_p/drawable-xxhdpi/ic_camera_blanket.png delete mode 100644 res_p/drawable-xxhdpi/ic_camera_normal.png create mode 100644 res_p/drawable-xxhdpi/ic_panorama_disabled.png delete mode 100644 res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png delete mode 100644 res_p/drawable-xxhdpi/ic_photo_sphere_normal.png create mode 100644 res_p/drawable-xxhdpi/ic_photosphere_blanket.png create mode 100644 res_p/drawable-xxhdpi/ic_photosphere_disabled.png create mode 100644 res_p/drawable-xxhdpi/ic_photosphere_normal.png create mode 100644 res_p/drawable-xxhdpi/ic_refocus_disabled.png delete mode 100644 res_p/drawable-xxhdpi/ic_video_blanket.png delete mode 100644 res_p/drawable-xxhdpi/ic_video_disabled.png delete mode 100644 res_p/drawable-xxhdpi/ic_video_normal.png delete mode 100644 res_p/drawable/ic_camera.xml delete mode 100644 res_p/drawable/ic_refocus.xml diff --git a/res/drawable-hdpi/aspect_ratio_16x9_selected.png b/res/drawable-hdpi/aspect_ratio_16x9_selected.png index ffe814166..db793627b 100644 Binary files a/res/drawable-hdpi/aspect_ratio_16x9_selected.png and b/res/drawable-hdpi/aspect_ratio_16x9_selected.png differ diff --git a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png index b91d93305..73f365985 100644 Binary files a/res/drawable-hdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-hdpi/aspect_ratio_16x9_unselected.png differ diff --git a/res/drawable-hdpi/aspect_ratio_4x3_selected.png b/res/drawable-hdpi/aspect_ratio_4x3_selected.png index 5a8e0327a..87b44f530 100644 Binary files a/res/drawable-hdpi/aspect_ratio_4x3_selected.png and b/res/drawable-hdpi/aspect_ratio_4x3_selected.png differ diff --git a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png index 849bc12c3..9ec9a7a59 100644 Binary files a/res/drawable-hdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-hdpi/aspect_ratio_4x3_unselected.png differ diff --git a/res/drawable-hdpi/geo_opt_in_graphic.png b/res/drawable-hdpi/geo_opt_in_graphic.png index 3648610ae..236eaa315 100644 Binary files a/res/drawable-hdpi/geo_opt_in_graphic.png and b/res/drawable-hdpi/geo_opt_in_graphic.png differ diff --git a/res/drawable-hdpi/ic_camera_blanket.png b/res/drawable-hdpi/ic_camera_blanket.png new file mode 100644 index 000000000..26307015a Binary files /dev/null and b/res/drawable-hdpi/ic_camera_blanket.png differ diff --git a/res/drawable-hdpi/ic_camera_disabled.png b/res/drawable-hdpi/ic_camera_disabled.png index 2486cba2c..27ff92d6b 100644 Binary files a/res/drawable-hdpi/ic_camera_disabled.png and b/res/drawable-hdpi/ic_camera_disabled.png differ diff --git a/res/drawable-hdpi/ic_camera_normal.png b/res/drawable-hdpi/ic_camera_normal.png new file mode 100644 index 000000000..acacd5b52 Binary files /dev/null and b/res/drawable-hdpi/ic_camera_normal.png differ diff --git a/res/drawable-hdpi/ic_capture_camera_disabled.png b/res/drawable-hdpi/ic_capture_camera_disabled.png new file mode 100644 index 000000000..4929c1d97 Binary files /dev/null and b/res/drawable-hdpi/ic_capture_camera_disabled.png differ diff --git a/res/drawable-hdpi/ic_capture_camera_normal.png b/res/drawable-hdpi/ic_capture_camera_normal.png new file mode 100644 index 000000000..129cae800 Binary files /dev/null and b/res/drawable-hdpi/ic_capture_camera_normal.png differ diff --git a/res/drawable-hdpi/ic_capture_video.png b/res/drawable-hdpi/ic_capture_video.png new file mode 100644 index 000000000..dc3d02679 Binary files /dev/null and b/res/drawable-hdpi/ic_capture_video.png differ diff --git a/res/drawable-hdpi/ic_capture_video_disabled.png b/res/drawable-hdpi/ic_capture_video_disabled.png new file mode 100644 index 000000000..e7548964c Binary files /dev/null and b/res/drawable-hdpi/ic_capture_video_disabled.png differ diff --git a/res/drawable-hdpi/ic_done_disabled.png b/res/drawable-hdpi/ic_done_disabled.png new file mode 100644 index 000000000..d074f90ab Binary files /dev/null and b/res/drawable-hdpi/ic_done_disabled.png differ diff --git a/res/drawable-hdpi/ic_done_normal.png b/res/drawable-hdpi/ic_done_normal.png new file mode 100644 index 000000000..521a8ca47 Binary files /dev/null and b/res/drawable-hdpi/ic_done_normal.png differ diff --git a/res/drawable-hdpi/ic_edit_disabled.png b/res/drawable-hdpi/ic_edit_disabled.png index 02c8e9701..1ca0eb45d 100644 Binary files a/res/drawable-hdpi/ic_edit_disabled.png and b/res/drawable-hdpi/ic_edit_disabled.png differ diff --git a/res/drawable-hdpi/ic_edit_normal.png b/res/drawable-hdpi/ic_edit_normal.png index 9eabda0b5..99e85627e 100644 Binary files a/res/drawable-hdpi/ic_edit_normal.png and b/res/drawable-hdpi/ic_edit_normal.png differ diff --git a/res/drawable-hdpi/ic_exposure_0.png b/res/drawable-hdpi/ic_exposure_0.png index 11b649502..d995d557f 100644 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_0_disabled.png b/res/drawable-hdpi/ic_exposure_0_disabled.png new file mode 100644 index 000000000..5315aec84 Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_0_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_0_indicator.png b/res/drawable-hdpi/ic_exposure_0_indicator.png index 25f742dc8..bbf0d32f9 100644 Binary files a/res/drawable-hdpi/ic_exposure_0_indicator.png and b/res/drawable-hdpi/ic_exposure_0_indicator.png differ diff --git a/res/drawable-hdpi/ic_exposure_disabled.png b/res/drawable-hdpi/ic_exposure_disabled.png index fd4492dc8..afa38321d 100644 Binary files a/res/drawable-hdpi/ic_exposure_disabled.png and b/res/drawable-hdpi/ic_exposure_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_indicator.png b/res/drawable-hdpi/ic_exposure_indicator.png new file mode 100644 index 000000000..4445049e3 Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_indicator.png differ diff --git a/res/drawable-hdpi/ic_exposure_n1.png b/res/drawable-hdpi/ic_exposure_n1.png index a0a0e7daf..38ed7e5e1 100644 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_n1_disabled.png b/res/drawable-hdpi/ic_exposure_n1_disabled.png new file mode 100644 index 000000000..29d2cb532 Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_n1_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_n1_indicator.png b/res/drawable-hdpi/ic_exposure_n1_indicator.png index baaef11df..96bafc017 100644 Binary files a/res/drawable-hdpi/ic_exposure_n1_indicator.png and b/res/drawable-hdpi/ic_exposure_n1_indicator.png differ diff --git a/res/drawable-hdpi/ic_exposure_n2.png b/res/drawable-hdpi/ic_exposure_n2.png index 1416e0d18..65204c986 100644 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_n2_disabled.png b/res/drawable-hdpi/ic_exposure_n2_disabled.png new file mode 100644 index 000000000..86e071e1c Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_n2_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_n2_indicator.png b/res/drawable-hdpi/ic_exposure_n2_indicator.png index dfb80d8f0..eae982d47 100644 Binary files a/res/drawable-hdpi/ic_exposure_n2_indicator.png and b/res/drawable-hdpi/ic_exposure_n2_indicator.png differ diff --git a/res/drawable-hdpi/ic_exposure_normal.png b/res/drawable-hdpi/ic_exposure_normal.png index 8a4d2ac1a..fd8fce1e7 100644 Binary files a/res/drawable-hdpi/ic_exposure_normal.png and b/res/drawable-hdpi/ic_exposure_normal.png differ diff --git a/res/drawable-hdpi/ic_exposure_p1.png b/res/drawable-hdpi/ic_exposure_p1.png index dc9bcb046..3f17dc3be 100644 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_p1_disabled.png b/res/drawable-hdpi/ic_exposure_p1_disabled.png new file mode 100644 index 000000000..2612043d4 Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_p1_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_p1_indicator.png b/res/drawable-hdpi/ic_exposure_p1_indicator.png index 56e962d06..399a16515 100644 Binary files a/res/drawable-hdpi/ic_exposure_p1_indicator.png and b/res/drawable-hdpi/ic_exposure_p1_indicator.png differ diff --git a/res/drawable-hdpi/ic_exposure_p2.png b/res/drawable-hdpi/ic_exposure_p2.png index 9016dd574..0d68d6037 100644 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_p2_disabled.png b/res/drawable-hdpi/ic_exposure_p2_disabled.png new file mode 100644 index 000000000..715cfa9f2 Binary files /dev/null and b/res/drawable-hdpi/ic_exposure_p2_disabled.png differ diff --git a/res/drawable-hdpi/ic_exposure_p2_indicator.png b/res/drawable-hdpi/ic_exposure_p2_indicator.png index fa1ed9ed7..c09c910fa 100644 Binary files a/res/drawable-hdpi/ic_exposure_p2_indicator.png and b/res/drawable-hdpi/ic_exposure_p2_indicator.png differ diff --git a/res/drawable-hdpi/ic_flash_auto_disabled.png b/res/drawable-hdpi/ic_flash_auto_disabled.png index f0ecb70aa..6248e707a 100644 Binary files a/res/drawable-hdpi/ic_flash_auto_disabled.png and b/res/drawable-hdpi/ic_flash_auto_disabled.png differ diff --git a/res/drawable-hdpi/ic_flash_auto_indicator.png b/res/drawable-hdpi/ic_flash_auto_indicator.png index d259231f2..0f433a904 100644 Binary files a/res/drawable-hdpi/ic_flash_auto_indicator.png and b/res/drawable-hdpi/ic_flash_auto_indicator.png differ diff --git a/res/drawable-hdpi/ic_flash_auto_normal.png b/res/drawable-hdpi/ic_flash_auto_normal.png index 0c8a863ac..ba7f28235 100644 Binary files a/res/drawable-hdpi/ic_flash_auto_normal.png and b/res/drawable-hdpi/ic_flash_auto_normal.png differ diff --git a/res/drawable-hdpi/ic_flash_off_disabled.png b/res/drawable-hdpi/ic_flash_off_disabled.png index d007bb1d4..0473cf79b 100644 Binary files a/res/drawable-hdpi/ic_flash_off_disabled.png and b/res/drawable-hdpi/ic_flash_off_disabled.png differ diff --git a/res/drawable-hdpi/ic_flash_off_indicator.png b/res/drawable-hdpi/ic_flash_off_indicator.png index ff000db0a..417858472 100644 Binary files a/res/drawable-hdpi/ic_flash_off_indicator.png and b/res/drawable-hdpi/ic_flash_off_indicator.png differ diff --git a/res/drawable-hdpi/ic_flash_off_normal.png b/res/drawable-hdpi/ic_flash_off_normal.png index 5630e71e8..d1201e791 100644 Binary files a/res/drawable-hdpi/ic_flash_off_normal.png and b/res/drawable-hdpi/ic_flash_off_normal.png differ diff --git a/res/drawable-hdpi/ic_flash_on_disabled.png b/res/drawable-hdpi/ic_flash_on_disabled.png index 930466518..041db6a20 100644 Binary files a/res/drawable-hdpi/ic_flash_on_disabled.png and b/res/drawable-hdpi/ic_flash_on_disabled.png differ diff --git a/res/drawable-hdpi/ic_flash_on_indicator.png b/res/drawable-hdpi/ic_flash_on_indicator.png index f169e005b..16be31455 100644 Binary files a/res/drawable-hdpi/ic_flash_on_indicator.png and b/res/drawable-hdpi/ic_flash_on_indicator.png differ diff --git a/res/drawable-hdpi/ic_flash_on_normal.png b/res/drawable-hdpi/ic_flash_on_normal.png index 926f386d5..5fc88816c 100644 Binary files a/res/drawable-hdpi/ic_flash_on_normal.png and b/res/drawable-hdpi/ic_flash_on_normal.png differ diff --git a/res/drawable-hdpi/ic_grid_off_disabled.png b/res/drawable-hdpi/ic_grid_off_disabled.png index 94c2800d9..3812d8993 100644 Binary files a/res/drawable-hdpi/ic_grid_off_disabled.png and b/res/drawable-hdpi/ic_grid_off_disabled.png differ diff --git a/res/drawable-hdpi/ic_grid_off_indicator.png b/res/drawable-hdpi/ic_grid_off_indicator.png index ba71a22ce..56795bd13 100644 Binary files a/res/drawable-hdpi/ic_grid_off_indicator.png and b/res/drawable-hdpi/ic_grid_off_indicator.png differ diff --git a/res/drawable-hdpi/ic_grid_off_normal.png b/res/drawable-hdpi/ic_grid_off_normal.png index c7b5bcdf0..5b15ec82d 100644 Binary files a/res/drawable-hdpi/ic_grid_off_normal.png and b/res/drawable-hdpi/ic_grid_off_normal.png differ diff --git a/res/drawable-hdpi/ic_grid_on_disabled.png b/res/drawable-hdpi/ic_grid_on_disabled.png index a2fc3d51e..fd7b58105 100644 Binary files a/res/drawable-hdpi/ic_grid_on_disabled.png and b/res/drawable-hdpi/ic_grid_on_disabled.png differ diff --git a/res/drawable-hdpi/ic_grid_on_indicator.png b/res/drawable-hdpi/ic_grid_on_indicator.png index b7f3c6985..18856ff31 100644 Binary files a/res/drawable-hdpi/ic_grid_on_indicator.png and b/res/drawable-hdpi/ic_grid_on_indicator.png differ diff --git a/res/drawable-hdpi/ic_grid_on_normal.png b/res/drawable-hdpi/ic_grid_on_normal.png index 921b87659..499d5ecce 100644 Binary files a/res/drawable-hdpi/ic_grid_on_normal.png and b/res/drawable-hdpi/ic_grid_on_normal.png differ diff --git a/res/drawable-hdpi/ic_hdr_off_disabled.png b/res/drawable-hdpi/ic_hdr_off_disabled.png index 8cd4956e3..5943a63f0 100644 Binary files a/res/drawable-hdpi/ic_hdr_off_disabled.png and b/res/drawable-hdpi/ic_hdr_off_disabled.png differ diff --git a/res/drawable-hdpi/ic_hdr_off_indicator.png b/res/drawable-hdpi/ic_hdr_off_indicator.png index c1a0d6c96..39298f9a3 100644 Binary files a/res/drawable-hdpi/ic_hdr_off_indicator.png and b/res/drawable-hdpi/ic_hdr_off_indicator.png differ diff --git a/res/drawable-hdpi/ic_hdr_off_normal.png b/res/drawable-hdpi/ic_hdr_off_normal.png index 06cb2c4bc..6d8d929f5 100644 Binary files a/res/drawable-hdpi/ic_hdr_off_normal.png and b/res/drawable-hdpi/ic_hdr_off_normal.png differ diff --git a/res/drawable-hdpi/ic_hdr_on_disabled.png b/res/drawable-hdpi/ic_hdr_on_disabled.png index 4ca89195f..25af5b4fc 100644 Binary files a/res/drawable-hdpi/ic_hdr_on_disabled.png and b/res/drawable-hdpi/ic_hdr_on_disabled.png differ diff --git a/res/drawable-hdpi/ic_hdr_on_indicator.png b/res/drawable-hdpi/ic_hdr_on_indicator.png index f60ff7c08..5e5d84336 100644 Binary files a/res/drawable-hdpi/ic_hdr_on_indicator.png and b/res/drawable-hdpi/ic_hdr_on_indicator.png differ diff --git a/res/drawable-hdpi/ic_hdr_on_normal.png b/res/drawable-hdpi/ic_hdr_on_normal.png index d5c56e86c..8f86f875f 100644 Binary files a/res/drawable-hdpi/ic_hdr_on_normal.png and b/res/drawable-hdpi/ic_hdr_on_normal.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_off_disabled.png b/res/drawable-hdpi/ic_hdr_plus_off_disabled.png index db0ab2579..4d7b04466 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_off_disabled.png and b/res/drawable-hdpi/ic_hdr_plus_off_disabled.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_off_indicator.png b/res/drawable-hdpi/ic_hdr_plus_off_indicator.png index 39e9d06af..9a650b7c4 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_off_indicator.png and b/res/drawable-hdpi/ic_hdr_plus_off_indicator.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_off_normal.png b/res/drawable-hdpi/ic_hdr_plus_off_normal.png index 51d073a27..4c7bb89c7 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_off_normal.png and b/res/drawable-hdpi/ic_hdr_plus_off_normal.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_on_disabled.png b/res/drawable-hdpi/ic_hdr_plus_on_disabled.png index c286eef6d..5596fd803 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_on_disabled.png and b/res/drawable-hdpi/ic_hdr_plus_on_disabled.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_on_indicator.png b/res/drawable-hdpi/ic_hdr_plus_on_indicator.png index 21c2350f0..74e914db5 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_on_indicator.png and b/res/drawable-hdpi/ic_hdr_plus_on_indicator.png differ diff --git a/res/drawable-hdpi/ic_hdr_plus_on_normal.png b/res/drawable-hdpi/ic_hdr_plus_on_normal.png index 8dfeadd80..95d542c16 100644 Binary files a/res/drawable-hdpi/ic_hdr_plus_on_normal.png and b/res/drawable-hdpi/ic_hdr_plus_on_normal.png differ diff --git a/res/drawable-hdpi/ic_panorama_disabled.png b/res/drawable-hdpi/ic_panorama_disabled.png deleted file mode 100644 index b07472122..000000000 Binary files a/res/drawable-hdpi/ic_panorama_disabled.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_photo_sphere_disabled.png b/res/drawable-hdpi/ic_photo_sphere_disabled.png deleted file mode 100644 index 01df5b956..000000000 Binary files a/res/drawable-hdpi/ic_photo_sphere_disabled.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_refocus_disabled.png b/res/drawable-hdpi/ic_refocus_disabled.png deleted file mode 100644 index d3581b64c..000000000 Binary files a/res/drawable-hdpi/ic_refocus_disabled.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_share_disabled.png b/res/drawable-hdpi/ic_share_disabled.png index 4645f6591..2794c4cf0 100644 Binary files a/res/drawable-hdpi/ic_share_disabled.png and b/res/drawable-hdpi/ic_share_disabled.png differ diff --git a/res/drawable-hdpi/ic_share_normal.png b/res/drawable-hdpi/ic_share_normal.png index a75ef1c08..be973834b 100644 Binary files a/res/drawable-hdpi/ic_share_normal.png and b/res/drawable-hdpi/ic_share_normal.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_back_disabled.png b/res/drawable-hdpi/ic_switch_camera_back_disabled.png index 1de4c6fae..d094c9135 100644 Binary files a/res/drawable-hdpi/ic_switch_camera_back_disabled.png and b/res/drawable-hdpi/ic_switch_camera_back_disabled.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_back_indicator.png b/res/drawable-hdpi/ic_switch_camera_back_indicator.png new file mode 100644 index 000000000..f27eb8df0 Binary files /dev/null and b/res/drawable-hdpi/ic_switch_camera_back_indicator.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_back_normal.png b/res/drawable-hdpi/ic_switch_camera_back_normal.png index 5586c0610..b4397f62a 100644 Binary files a/res/drawable-hdpi/ic_switch_camera_back_normal.png and b/res/drawable-hdpi/ic_switch_camera_back_normal.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_front_disabled.png b/res/drawable-hdpi/ic_switch_camera_front_disabled.png index 114ab121d..e43468dfc 100644 Binary files a/res/drawable-hdpi/ic_switch_camera_front_disabled.png and b/res/drawable-hdpi/ic_switch_camera_front_disabled.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_front_indicator.png b/res/drawable-hdpi/ic_switch_camera_front_indicator.png new file mode 100644 index 000000000..af2bb295c Binary files /dev/null and b/res/drawable-hdpi/ic_switch_camera_front_indicator.png differ diff --git a/res/drawable-hdpi/ic_switch_camera_front_normal.png b/res/drawable-hdpi/ic_switch_camera_front_normal.png index 3569dd5ea..913d071ab 100644 Binary files a/res/drawable-hdpi/ic_switch_camera_front_normal.png and b/res/drawable-hdpi/ic_switch_camera_front_normal.png differ diff --git a/res/drawable-hdpi/ic_timer_10s_disabled.png b/res/drawable-hdpi/ic_timer_10s_disabled.png index 0f9d4a1fa..14c3e0c8d 100644 Binary files a/res/drawable-hdpi/ic_timer_10s_disabled.png and b/res/drawable-hdpi/ic_timer_10s_disabled.png differ diff --git a/res/drawable-hdpi/ic_timer_10s_indicator.png b/res/drawable-hdpi/ic_timer_10s_indicator.png index 8bde7dea5..4aeea0dca 100644 Binary files a/res/drawable-hdpi/ic_timer_10s_indicator.png and b/res/drawable-hdpi/ic_timer_10s_indicator.png differ diff --git a/res/drawable-hdpi/ic_timer_10s_normal.png b/res/drawable-hdpi/ic_timer_10s_normal.png index 8478ac860..13abe9a85 100644 Binary files a/res/drawable-hdpi/ic_timer_10s_normal.png and b/res/drawable-hdpi/ic_timer_10s_normal.png differ diff --git a/res/drawable-hdpi/ic_timer_3s_disabled.png b/res/drawable-hdpi/ic_timer_3s_disabled.png index eaf9ffe6f..66c953f59 100644 Binary files a/res/drawable-hdpi/ic_timer_3s_disabled.png and b/res/drawable-hdpi/ic_timer_3s_disabled.png differ diff --git a/res/drawable-hdpi/ic_timer_3s_indicator.png b/res/drawable-hdpi/ic_timer_3s_indicator.png index f367d9a00..ae354f0cf 100644 Binary files a/res/drawable-hdpi/ic_timer_3s_indicator.png and b/res/drawable-hdpi/ic_timer_3s_indicator.png differ diff --git a/res/drawable-hdpi/ic_timer_3s_normal.png b/res/drawable-hdpi/ic_timer_3s_normal.png index e4b696d02..29693a067 100644 Binary files a/res/drawable-hdpi/ic_timer_3s_normal.png and b/res/drawable-hdpi/ic_timer_3s_normal.png differ diff --git a/res/drawable-hdpi/ic_timer_auto_disabled.png b/res/drawable-hdpi/ic_timer_auto_disabled.png new file mode 100644 index 000000000..e9dd24ee2 Binary files /dev/null and b/res/drawable-hdpi/ic_timer_auto_disabled.png differ diff --git a/res/drawable-hdpi/ic_timer_auto_indicator.png b/res/drawable-hdpi/ic_timer_auto_indicator.png new file mode 100644 index 000000000..e9c370eac Binary files /dev/null and b/res/drawable-hdpi/ic_timer_auto_indicator.png differ diff --git a/res/drawable-hdpi/ic_timer_auto_normal.png b/res/drawable-hdpi/ic_timer_auto_normal.png new file mode 100644 index 000000000..58db51fdf Binary files /dev/null and b/res/drawable-hdpi/ic_timer_auto_normal.png differ diff --git a/res/drawable-hdpi/ic_timer_off_disabled.png b/res/drawable-hdpi/ic_timer_off_disabled.png index 713da5bea..7cf72912f 100644 Binary files a/res/drawable-hdpi/ic_timer_off_disabled.png and b/res/drawable-hdpi/ic_timer_off_disabled.png differ diff --git a/res/drawable-hdpi/ic_timer_off_indicator.png b/res/drawable-hdpi/ic_timer_off_indicator.png index e3f08f694..178b5ec4a 100644 Binary files a/res/drawable-hdpi/ic_timer_off_indicator.png and b/res/drawable-hdpi/ic_timer_off_indicator.png differ diff --git a/res/drawable-hdpi/ic_timer_off_normal.png b/res/drawable-hdpi/ic_timer_off_normal.png index 9f1786236..1aeb87887 100644 Binary files a/res/drawable-hdpi/ic_timer_off_normal.png and b/res/drawable-hdpi/ic_timer_off_normal.png differ diff --git a/res/drawable-hdpi/ic_trash_disabled.png b/res/drawable-hdpi/ic_trash_disabled.png new file mode 100644 index 000000000..941fc7638 Binary files /dev/null and b/res/drawable-hdpi/ic_trash_disabled.png differ diff --git a/res/drawable-hdpi/ic_trash_normal.png b/res/drawable-hdpi/ic_trash_normal.png new file mode 100644 index 000000000..49d9ce0c5 Binary files /dev/null and b/res/drawable-hdpi/ic_trash_normal.png differ diff --git a/res/drawable-hdpi/ic_video_blanket.png b/res/drawable-hdpi/ic_video_blanket.png new file mode 100644 index 000000000..6ec9d1249 Binary files /dev/null and b/res/drawable-hdpi/ic_video_blanket.png differ diff --git a/res/drawable-hdpi/ic_video_disabled.png b/res/drawable-hdpi/ic_video_disabled.png new file mode 100644 index 000000000..35817eb60 Binary files /dev/null and b/res/drawable-hdpi/ic_video_disabled.png differ diff --git a/res/drawable-hdpi/ic_video_normal.png b/res/drawable-hdpi/ic_video_normal.png new file mode 100644 index 000000000..f7319b35f Binary files /dev/null and b/res/drawable-hdpi/ic_video_normal.png differ diff --git a/res/drawable-mdpi/aspect_ratio_16x9_selected.png b/res/drawable-mdpi/aspect_ratio_16x9_selected.png index 5f194a709..241117918 100644 Binary files a/res/drawable-mdpi/aspect_ratio_16x9_selected.png and b/res/drawable-mdpi/aspect_ratio_16x9_selected.png differ diff --git a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png index 533d2ad7e..a7f3afd88 100644 Binary files a/res/drawable-mdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-mdpi/aspect_ratio_16x9_unselected.png differ diff --git a/res/drawable-mdpi/aspect_ratio_4x3_selected.png b/res/drawable-mdpi/aspect_ratio_4x3_selected.png index b784de11e..47026da4f 100644 Binary files a/res/drawable-mdpi/aspect_ratio_4x3_selected.png and b/res/drawable-mdpi/aspect_ratio_4x3_selected.png differ diff --git a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png index 29bfd60fc..abaeea274 100644 Binary files a/res/drawable-mdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-mdpi/aspect_ratio_4x3_unselected.png differ diff --git a/res/drawable-mdpi/geo_opt_in_graphic.png b/res/drawable-mdpi/geo_opt_in_graphic.png index d640d3635..a40e32fc6 100644 Binary files a/res/drawable-mdpi/geo_opt_in_graphic.png and b/res/drawable-mdpi/geo_opt_in_graphic.png differ diff --git a/res/drawable-mdpi/ic_camera_blanket.png b/res/drawable-mdpi/ic_camera_blanket.png new file mode 100644 index 000000000..8d2e6601c Binary files /dev/null and b/res/drawable-mdpi/ic_camera_blanket.png differ diff --git a/res/drawable-mdpi/ic_camera_disabled.png b/res/drawable-mdpi/ic_camera_disabled.png index 9d569edef..d307df494 100644 Binary files a/res/drawable-mdpi/ic_camera_disabled.png and b/res/drawable-mdpi/ic_camera_disabled.png differ diff --git a/res/drawable-mdpi/ic_camera_normal.png b/res/drawable-mdpi/ic_camera_normal.png new file mode 100644 index 000000000..718691045 Binary files /dev/null and b/res/drawable-mdpi/ic_camera_normal.png differ diff --git a/res/drawable-mdpi/ic_capture_camera_disabled.png b/res/drawable-mdpi/ic_capture_camera_disabled.png new file mode 100644 index 000000000..b9da7f1a3 Binary files /dev/null and b/res/drawable-mdpi/ic_capture_camera_disabled.png differ diff --git a/res/drawable-mdpi/ic_capture_camera_normal.png b/res/drawable-mdpi/ic_capture_camera_normal.png new file mode 100644 index 000000000..491631836 Binary files /dev/null and b/res/drawable-mdpi/ic_capture_camera_normal.png differ diff --git a/res/drawable-mdpi/ic_capture_video.png b/res/drawable-mdpi/ic_capture_video.png new file mode 100644 index 000000000..b38059cc3 Binary files /dev/null and b/res/drawable-mdpi/ic_capture_video.png differ diff --git a/res/drawable-mdpi/ic_capture_video_disabled.png b/res/drawable-mdpi/ic_capture_video_disabled.png new file mode 100644 index 000000000..9c190f499 Binary files /dev/null and b/res/drawable-mdpi/ic_capture_video_disabled.png differ diff --git a/res/drawable-mdpi/ic_done_disabled.png b/res/drawable-mdpi/ic_done_disabled.png new file mode 100644 index 000000000..9cc60673e Binary files /dev/null and b/res/drawable-mdpi/ic_done_disabled.png differ diff --git a/res/drawable-mdpi/ic_done_normal.png b/res/drawable-mdpi/ic_done_normal.png new file mode 100644 index 000000000..107c988bc Binary files /dev/null and b/res/drawable-mdpi/ic_done_normal.png differ diff --git a/res/drawable-mdpi/ic_edit_disabled.png b/res/drawable-mdpi/ic_edit_disabled.png index 74c07748b..28decdccb 100644 Binary files a/res/drawable-mdpi/ic_edit_disabled.png and b/res/drawable-mdpi/ic_edit_disabled.png differ diff --git a/res/drawable-mdpi/ic_edit_normal.png b/res/drawable-mdpi/ic_edit_normal.png index f9998b4f9..ac89d55f1 100644 Binary files a/res/drawable-mdpi/ic_edit_normal.png and b/res/drawable-mdpi/ic_edit_normal.png differ diff --git a/res/drawable-mdpi/ic_exposure_0.png b/res/drawable-mdpi/ic_exposure_0.png index e1bb76586..dcf425dcd 100644 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_0_disabled.png b/res/drawable-mdpi/ic_exposure_0_disabled.png new file mode 100644 index 000000000..df3617355 Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_0_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_0_indicator.png b/res/drawable-mdpi/ic_exposure_0_indicator.png index 661dace03..992b4fbbf 100644 Binary files a/res/drawable-mdpi/ic_exposure_0_indicator.png and b/res/drawable-mdpi/ic_exposure_0_indicator.png differ diff --git a/res/drawable-mdpi/ic_exposure_disabled.png b/res/drawable-mdpi/ic_exposure_disabled.png index 67b80d339..6fc1f0acd 100644 Binary files a/res/drawable-mdpi/ic_exposure_disabled.png and b/res/drawable-mdpi/ic_exposure_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_indicator.png b/res/drawable-mdpi/ic_exposure_indicator.png new file mode 100644 index 000000000..585e42176 Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_indicator.png differ diff --git a/res/drawable-mdpi/ic_exposure_n1.png b/res/drawable-mdpi/ic_exposure_n1.png index 4191c6f73..f3179240c 100644 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_n1_disabled.png b/res/drawable-mdpi/ic_exposure_n1_disabled.png new file mode 100644 index 000000000..457fb4086 Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_n1_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_n1_indicator.png b/res/drawable-mdpi/ic_exposure_n1_indicator.png index 957504c86..910350414 100644 Binary files a/res/drawable-mdpi/ic_exposure_n1_indicator.png and b/res/drawable-mdpi/ic_exposure_n1_indicator.png differ diff --git a/res/drawable-mdpi/ic_exposure_n2.png b/res/drawable-mdpi/ic_exposure_n2.png index 19201ecdc..30705812b 100644 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_n2_disabled.png b/res/drawable-mdpi/ic_exposure_n2_disabled.png new file mode 100644 index 000000000..1b2080ab3 Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_n2_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_n2_indicator.png b/res/drawable-mdpi/ic_exposure_n2_indicator.png index 3da2d10eb..a363785c7 100644 Binary files a/res/drawable-mdpi/ic_exposure_n2_indicator.png and b/res/drawable-mdpi/ic_exposure_n2_indicator.png differ diff --git a/res/drawable-mdpi/ic_exposure_normal.png b/res/drawable-mdpi/ic_exposure_normal.png index e86708cda..e3c5bfbab 100644 Binary files a/res/drawable-mdpi/ic_exposure_normal.png and b/res/drawable-mdpi/ic_exposure_normal.png differ diff --git a/res/drawable-mdpi/ic_exposure_p1.png b/res/drawable-mdpi/ic_exposure_p1.png index a5f5b65cd..bfac95205 100644 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_p1_disabled.png b/res/drawable-mdpi/ic_exposure_p1_disabled.png new file mode 100644 index 000000000..09f7cae56 Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_p1_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_p1_indicator.png b/res/drawable-mdpi/ic_exposure_p1_indicator.png index 6395aaee4..1f1280de4 100644 Binary files a/res/drawable-mdpi/ic_exposure_p1_indicator.png and b/res/drawable-mdpi/ic_exposure_p1_indicator.png differ diff --git a/res/drawable-mdpi/ic_exposure_p2.png b/res/drawable-mdpi/ic_exposure_p2.png index 30c9eaff5..e83b64796 100644 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_p2_disabled.png b/res/drawable-mdpi/ic_exposure_p2_disabled.png new file mode 100644 index 000000000..57446021a Binary files /dev/null and b/res/drawable-mdpi/ic_exposure_p2_disabled.png differ diff --git a/res/drawable-mdpi/ic_exposure_p2_indicator.png b/res/drawable-mdpi/ic_exposure_p2_indicator.png index ba8e2c224..4cfcd7673 100644 Binary files a/res/drawable-mdpi/ic_exposure_p2_indicator.png and b/res/drawable-mdpi/ic_exposure_p2_indicator.png differ diff --git a/res/drawable-mdpi/ic_flash_auto_disabled.png b/res/drawable-mdpi/ic_flash_auto_disabled.png index 084ee2297..291ff0114 100644 Binary files a/res/drawable-mdpi/ic_flash_auto_disabled.png and b/res/drawable-mdpi/ic_flash_auto_disabled.png differ diff --git a/res/drawable-mdpi/ic_flash_auto_indicator.png b/res/drawable-mdpi/ic_flash_auto_indicator.png index 53838b80f..bacb79704 100644 Binary files a/res/drawable-mdpi/ic_flash_auto_indicator.png and b/res/drawable-mdpi/ic_flash_auto_indicator.png differ diff --git a/res/drawable-mdpi/ic_flash_auto_normal.png b/res/drawable-mdpi/ic_flash_auto_normal.png index 5b071a318..44382de07 100644 Binary files a/res/drawable-mdpi/ic_flash_auto_normal.png and b/res/drawable-mdpi/ic_flash_auto_normal.png differ diff --git a/res/drawable-mdpi/ic_flash_off_disabled.png b/res/drawable-mdpi/ic_flash_off_disabled.png index 67bd6c6f5..f9b28599f 100644 Binary files a/res/drawable-mdpi/ic_flash_off_disabled.png and b/res/drawable-mdpi/ic_flash_off_disabled.png differ diff --git a/res/drawable-mdpi/ic_flash_off_indicator.png b/res/drawable-mdpi/ic_flash_off_indicator.png index 11876f871..7c418fe00 100644 Binary files a/res/drawable-mdpi/ic_flash_off_indicator.png and b/res/drawable-mdpi/ic_flash_off_indicator.png differ diff --git a/res/drawable-mdpi/ic_flash_off_normal.png b/res/drawable-mdpi/ic_flash_off_normal.png index ade4ec50e..0af1bee34 100644 Binary files a/res/drawable-mdpi/ic_flash_off_normal.png and b/res/drawable-mdpi/ic_flash_off_normal.png differ diff --git a/res/drawable-mdpi/ic_flash_on_disabled.png b/res/drawable-mdpi/ic_flash_on_disabled.png index f935371a3..9403b7dd1 100644 Binary files a/res/drawable-mdpi/ic_flash_on_disabled.png and b/res/drawable-mdpi/ic_flash_on_disabled.png differ diff --git a/res/drawable-mdpi/ic_flash_on_indicator.png b/res/drawable-mdpi/ic_flash_on_indicator.png index 9235c05ec..3e6015004 100644 Binary files a/res/drawable-mdpi/ic_flash_on_indicator.png and b/res/drawable-mdpi/ic_flash_on_indicator.png differ diff --git a/res/drawable-mdpi/ic_flash_on_normal.png b/res/drawable-mdpi/ic_flash_on_normal.png index e0545f284..080293cbf 100644 Binary files a/res/drawable-mdpi/ic_flash_on_normal.png and b/res/drawable-mdpi/ic_flash_on_normal.png differ diff --git a/res/drawable-mdpi/ic_grid_off_disabled.png b/res/drawable-mdpi/ic_grid_off_disabled.png index a467a8734..2008e0295 100644 Binary files a/res/drawable-mdpi/ic_grid_off_disabled.png and b/res/drawable-mdpi/ic_grid_off_disabled.png differ diff --git a/res/drawable-mdpi/ic_grid_off_indicator.png b/res/drawable-mdpi/ic_grid_off_indicator.png index d50c9c0af..e85ec40dc 100644 Binary files a/res/drawable-mdpi/ic_grid_off_indicator.png and b/res/drawable-mdpi/ic_grid_off_indicator.png differ diff --git a/res/drawable-mdpi/ic_grid_off_normal.png b/res/drawable-mdpi/ic_grid_off_normal.png index faf2ff89e..b3b64eaf4 100644 Binary files a/res/drawable-mdpi/ic_grid_off_normal.png and b/res/drawable-mdpi/ic_grid_off_normal.png differ diff --git a/res/drawable-mdpi/ic_grid_on_disabled.png b/res/drawable-mdpi/ic_grid_on_disabled.png index a3a336ab8..07898c26f 100644 Binary files a/res/drawable-mdpi/ic_grid_on_disabled.png and b/res/drawable-mdpi/ic_grid_on_disabled.png differ diff --git a/res/drawable-mdpi/ic_grid_on_indicator.png b/res/drawable-mdpi/ic_grid_on_indicator.png index 855d60d46..15e3538c2 100644 Binary files a/res/drawable-mdpi/ic_grid_on_indicator.png and b/res/drawable-mdpi/ic_grid_on_indicator.png differ diff --git a/res/drawable-mdpi/ic_grid_on_normal.png b/res/drawable-mdpi/ic_grid_on_normal.png index 970a7cdff..e27b25c45 100644 Binary files a/res/drawable-mdpi/ic_grid_on_normal.png and b/res/drawable-mdpi/ic_grid_on_normal.png differ diff --git a/res/drawable-mdpi/ic_hdr_off_disabled.png b/res/drawable-mdpi/ic_hdr_off_disabled.png index 6305f34ae..eba65051d 100644 Binary files a/res/drawable-mdpi/ic_hdr_off_disabled.png and b/res/drawable-mdpi/ic_hdr_off_disabled.png differ diff --git a/res/drawable-mdpi/ic_hdr_off_indicator.png b/res/drawable-mdpi/ic_hdr_off_indicator.png index 67ee5ce6d..0e3ea54cd 100644 Binary files a/res/drawable-mdpi/ic_hdr_off_indicator.png and b/res/drawable-mdpi/ic_hdr_off_indicator.png differ diff --git a/res/drawable-mdpi/ic_hdr_off_normal.png b/res/drawable-mdpi/ic_hdr_off_normal.png index 541002e94..2abeaf0f5 100644 Binary files a/res/drawable-mdpi/ic_hdr_off_normal.png and b/res/drawable-mdpi/ic_hdr_off_normal.png differ diff --git a/res/drawable-mdpi/ic_hdr_on_disabled.png b/res/drawable-mdpi/ic_hdr_on_disabled.png index ee1a87775..cae13eb4a 100644 Binary files a/res/drawable-mdpi/ic_hdr_on_disabled.png and b/res/drawable-mdpi/ic_hdr_on_disabled.png differ diff --git a/res/drawable-mdpi/ic_hdr_on_indicator.png b/res/drawable-mdpi/ic_hdr_on_indicator.png index 65c58460e..afd53602c 100644 Binary files a/res/drawable-mdpi/ic_hdr_on_indicator.png and b/res/drawable-mdpi/ic_hdr_on_indicator.png differ diff --git a/res/drawable-mdpi/ic_hdr_on_normal.png b/res/drawable-mdpi/ic_hdr_on_normal.png index c911e40f1..06987d9c0 100644 Binary files a/res/drawable-mdpi/ic_hdr_on_normal.png and b/res/drawable-mdpi/ic_hdr_on_normal.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_off_disabled.png b/res/drawable-mdpi/ic_hdr_plus_off_disabled.png index ca4f3d7e6..34470e4f2 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_off_disabled.png and b/res/drawable-mdpi/ic_hdr_plus_off_disabled.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_off_indicator.png b/res/drawable-mdpi/ic_hdr_plus_off_indicator.png index 489240ac6..ff26c0211 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_off_indicator.png and b/res/drawable-mdpi/ic_hdr_plus_off_indicator.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_off_normal.png b/res/drawable-mdpi/ic_hdr_plus_off_normal.png index 9b82f20c9..b4a9e03e5 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_off_normal.png and b/res/drawable-mdpi/ic_hdr_plus_off_normal.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_on_disabled.png b/res/drawable-mdpi/ic_hdr_plus_on_disabled.png index 320b3ed52..484e2372e 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_on_disabled.png and b/res/drawable-mdpi/ic_hdr_plus_on_disabled.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_on_indicator.png b/res/drawable-mdpi/ic_hdr_plus_on_indicator.png index 1509bbf0a..56a92153d 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_on_indicator.png and b/res/drawable-mdpi/ic_hdr_plus_on_indicator.png differ diff --git a/res/drawable-mdpi/ic_hdr_plus_on_normal.png b/res/drawable-mdpi/ic_hdr_plus_on_normal.png index e891a3e69..30b4904fd 100644 Binary files a/res/drawable-mdpi/ic_hdr_plus_on_normal.png and b/res/drawable-mdpi/ic_hdr_plus_on_normal.png differ diff --git a/res/drawable-mdpi/ic_panorama_disabled.png b/res/drawable-mdpi/ic_panorama_disabled.png deleted file mode 100644 index 69f2ec478..000000000 Binary files a/res/drawable-mdpi/ic_panorama_disabled.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_refocus_disabled.png b/res/drawable-mdpi/ic_refocus_disabled.png deleted file mode 100644 index 4fc346d5b..000000000 Binary files a/res/drawable-mdpi/ic_refocus_disabled.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_share_disabled.png b/res/drawable-mdpi/ic_share_disabled.png index 9bf111198..15dbc53ca 100644 Binary files a/res/drawable-mdpi/ic_share_disabled.png and b/res/drawable-mdpi/ic_share_disabled.png differ diff --git a/res/drawable-mdpi/ic_share_normal.png b/res/drawable-mdpi/ic_share_normal.png index f7bb67855..5c4d8412a 100644 Binary files a/res/drawable-mdpi/ic_share_normal.png and b/res/drawable-mdpi/ic_share_normal.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_back_disabled.png b/res/drawable-mdpi/ic_switch_camera_back_disabled.png index 2835252ec..e3f5bb7a4 100644 Binary files a/res/drawable-mdpi/ic_switch_camera_back_disabled.png and b/res/drawable-mdpi/ic_switch_camera_back_disabled.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_back_indicator.png b/res/drawable-mdpi/ic_switch_camera_back_indicator.png new file mode 100644 index 000000000..48c45e92d Binary files /dev/null and b/res/drawable-mdpi/ic_switch_camera_back_indicator.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_back_normal.png b/res/drawable-mdpi/ic_switch_camera_back_normal.png index 627e8903b..98893ab8c 100644 Binary files a/res/drawable-mdpi/ic_switch_camera_back_normal.png and b/res/drawable-mdpi/ic_switch_camera_back_normal.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_front_disabled.png b/res/drawable-mdpi/ic_switch_camera_front_disabled.png index 421cc28a4..d71e88058 100644 Binary files a/res/drawable-mdpi/ic_switch_camera_front_disabled.png and b/res/drawable-mdpi/ic_switch_camera_front_disabled.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_front_indicator.png b/res/drawable-mdpi/ic_switch_camera_front_indicator.png new file mode 100644 index 000000000..6e9dbb702 Binary files /dev/null and b/res/drawable-mdpi/ic_switch_camera_front_indicator.png differ diff --git a/res/drawable-mdpi/ic_switch_camera_front_normal.png b/res/drawable-mdpi/ic_switch_camera_front_normal.png index fe6f789a6..10560d0da 100644 Binary files a/res/drawable-mdpi/ic_switch_camera_front_normal.png and b/res/drawable-mdpi/ic_switch_camera_front_normal.png differ diff --git a/res/drawable-mdpi/ic_timer_10s_disabled.png b/res/drawable-mdpi/ic_timer_10s_disabled.png index 6ce956406..538ea3992 100644 Binary files a/res/drawable-mdpi/ic_timer_10s_disabled.png and b/res/drawable-mdpi/ic_timer_10s_disabled.png differ diff --git a/res/drawable-mdpi/ic_timer_10s_indicator.png b/res/drawable-mdpi/ic_timer_10s_indicator.png index 2bbf6f3dc..3216283f2 100644 Binary files a/res/drawable-mdpi/ic_timer_10s_indicator.png and b/res/drawable-mdpi/ic_timer_10s_indicator.png differ diff --git a/res/drawable-mdpi/ic_timer_10s_normal.png b/res/drawable-mdpi/ic_timer_10s_normal.png index 3d06ee482..1880878fb 100644 Binary files a/res/drawable-mdpi/ic_timer_10s_normal.png and b/res/drawable-mdpi/ic_timer_10s_normal.png differ diff --git a/res/drawable-mdpi/ic_timer_3s_disabled.png b/res/drawable-mdpi/ic_timer_3s_disabled.png index 372a1b1ac..954e68f21 100644 Binary files a/res/drawable-mdpi/ic_timer_3s_disabled.png and b/res/drawable-mdpi/ic_timer_3s_disabled.png differ diff --git a/res/drawable-mdpi/ic_timer_3s_indicator.png b/res/drawable-mdpi/ic_timer_3s_indicator.png index db5c4ce94..d713094f6 100644 Binary files a/res/drawable-mdpi/ic_timer_3s_indicator.png and b/res/drawable-mdpi/ic_timer_3s_indicator.png differ diff --git a/res/drawable-mdpi/ic_timer_3s_normal.png b/res/drawable-mdpi/ic_timer_3s_normal.png index d9e083e79..c5e548faf 100644 Binary files a/res/drawable-mdpi/ic_timer_3s_normal.png and b/res/drawable-mdpi/ic_timer_3s_normal.png differ diff --git a/res/drawable-mdpi/ic_timer_auto_disabled.png b/res/drawable-mdpi/ic_timer_auto_disabled.png new file mode 100644 index 000000000..5a23bf66d Binary files /dev/null and b/res/drawable-mdpi/ic_timer_auto_disabled.png differ diff --git a/res/drawable-mdpi/ic_timer_auto_indicator.png b/res/drawable-mdpi/ic_timer_auto_indicator.png new file mode 100644 index 000000000..8f60aa99c Binary files /dev/null and b/res/drawable-mdpi/ic_timer_auto_indicator.png differ diff --git a/res/drawable-mdpi/ic_timer_auto_normal.png b/res/drawable-mdpi/ic_timer_auto_normal.png new file mode 100644 index 000000000..cea9daf3b Binary files /dev/null and b/res/drawable-mdpi/ic_timer_auto_normal.png differ diff --git a/res/drawable-mdpi/ic_timer_off_disabled.png b/res/drawable-mdpi/ic_timer_off_disabled.png index 046328268..176545acb 100644 Binary files a/res/drawable-mdpi/ic_timer_off_disabled.png and b/res/drawable-mdpi/ic_timer_off_disabled.png differ diff --git a/res/drawable-mdpi/ic_timer_off_indicator.png b/res/drawable-mdpi/ic_timer_off_indicator.png index 9780cc5bb..3b028c172 100644 Binary files a/res/drawable-mdpi/ic_timer_off_indicator.png and b/res/drawable-mdpi/ic_timer_off_indicator.png differ diff --git a/res/drawable-mdpi/ic_timer_off_normal.png b/res/drawable-mdpi/ic_timer_off_normal.png index ad66d9099..f43b799aa 100644 Binary files a/res/drawable-mdpi/ic_timer_off_normal.png and b/res/drawable-mdpi/ic_timer_off_normal.png differ diff --git a/res/drawable-mdpi/ic_trash_disabled.png b/res/drawable-mdpi/ic_trash_disabled.png new file mode 100644 index 000000000..1f1a2151d Binary files /dev/null and b/res/drawable-mdpi/ic_trash_disabled.png differ diff --git a/res/drawable-mdpi/ic_trash_normal.png b/res/drawable-mdpi/ic_trash_normal.png new file mode 100644 index 000000000..e0a9ff6ce Binary files /dev/null and b/res/drawable-mdpi/ic_trash_normal.png differ diff --git a/res/drawable-mdpi/ic_video_blanket.png b/res/drawable-mdpi/ic_video_blanket.png new file mode 100644 index 000000000..bea42e1e3 Binary files /dev/null and b/res/drawable-mdpi/ic_video_blanket.png differ diff --git a/res/drawable-mdpi/ic_video_disabled.png b/res/drawable-mdpi/ic_video_disabled.png new file mode 100644 index 000000000..7531600f0 Binary files /dev/null and b/res/drawable-mdpi/ic_video_disabled.png differ diff --git a/res/drawable-mdpi/ic_video_normal.png b/res/drawable-mdpi/ic_video_normal.png new file mode 100644 index 000000000..b95ab5599 Binary files /dev/null and b/res/drawable-mdpi/ic_video_normal.png differ diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png index b456a39ee..c05aef5fe 100644 Binary files a/res/drawable-xhdpi/aspect_ratio_16x9_selected.png and b/res/drawable-xhdpi/aspect_ratio_16x9_selected.png differ diff --git a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png index 4d9b8991a..db606f323 100644 Binary files a/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-xhdpi/aspect_ratio_16x9_unselected.png differ diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png index 1a087db16..45df82ec3 100644 Binary files a/res/drawable-xhdpi/aspect_ratio_4x3_selected.png and b/res/drawable-xhdpi/aspect_ratio_4x3_selected.png differ diff --git a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png index 3c43025ad..460d5a8ae 100644 Binary files a/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-xhdpi/aspect_ratio_4x3_unselected.png differ diff --git a/res/drawable-xhdpi/geo_opt_in_graphic.png b/res/drawable-xhdpi/geo_opt_in_graphic.png index 95ceabb38..a51d1513f 100644 Binary files a/res/drawable-xhdpi/geo_opt_in_graphic.png and b/res/drawable-xhdpi/geo_opt_in_graphic.png differ diff --git a/res/drawable-xhdpi/ic_camera_blanket.png b/res/drawable-xhdpi/ic_camera_blanket.png new file mode 100644 index 000000000..26fcae4c5 Binary files /dev/null and b/res/drawable-xhdpi/ic_camera_blanket.png differ diff --git a/res/drawable-xhdpi/ic_camera_disabled.png b/res/drawable-xhdpi/ic_camera_disabled.png index 89ea31dfe..cc31b6c79 100644 Binary files a/res/drawable-xhdpi/ic_camera_disabled.png and b/res/drawable-xhdpi/ic_camera_disabled.png differ diff --git a/res/drawable-xhdpi/ic_camera_normal.png b/res/drawable-xhdpi/ic_camera_normal.png new file mode 100644 index 000000000..78536d028 Binary files /dev/null and b/res/drawable-xhdpi/ic_camera_normal.png differ diff --git a/res/drawable-xhdpi/ic_capture_camera_disabled.png b/res/drawable-xhdpi/ic_capture_camera_disabled.png new file mode 100644 index 000000000..93c03adcf Binary files /dev/null and b/res/drawable-xhdpi/ic_capture_camera_disabled.png differ diff --git a/res/drawable-xhdpi/ic_capture_camera_normal.png b/res/drawable-xhdpi/ic_capture_camera_normal.png new file mode 100644 index 000000000..1b9fd9b28 Binary files /dev/null and b/res/drawable-xhdpi/ic_capture_camera_normal.png differ diff --git a/res/drawable-xhdpi/ic_capture_video.png b/res/drawable-xhdpi/ic_capture_video.png new file mode 100644 index 000000000..8bcdd8105 Binary files /dev/null and b/res/drawable-xhdpi/ic_capture_video.png differ diff --git a/res/drawable-xhdpi/ic_capture_video_disabled.png b/res/drawable-xhdpi/ic_capture_video_disabled.png new file mode 100644 index 000000000..c34539174 Binary files /dev/null and b/res/drawable-xhdpi/ic_capture_video_disabled.png differ diff --git a/res/drawable-xhdpi/ic_done_disabled.png b/res/drawable-xhdpi/ic_done_disabled.png new file mode 100644 index 000000000..b2b2a62e4 Binary files /dev/null and b/res/drawable-xhdpi/ic_done_disabled.png differ diff --git a/res/drawable-xhdpi/ic_done_normal.png b/res/drawable-xhdpi/ic_done_normal.png new file mode 100644 index 000000000..ed4edd52f Binary files /dev/null and b/res/drawable-xhdpi/ic_done_normal.png differ diff --git a/res/drawable-xhdpi/ic_edit_disabled.png b/res/drawable-xhdpi/ic_edit_disabled.png index cd0fcdbdf..442ea514c 100644 Binary files a/res/drawable-xhdpi/ic_edit_disabled.png and b/res/drawable-xhdpi/ic_edit_disabled.png differ diff --git a/res/drawable-xhdpi/ic_edit_normal.png b/res/drawable-xhdpi/ic_edit_normal.png index 269b1a4d5..b6359c9da 100644 Binary files a/res/drawable-xhdpi/ic_edit_normal.png and b/res/drawable-xhdpi/ic_edit_normal.png differ diff --git a/res/drawable-xhdpi/ic_exposure_0.png b/res/drawable-xhdpi/ic_exposure_0.png index c7502cf02..f44ff5076 100644 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_0_disabled.png b/res/drawable-xhdpi/ic_exposure_0_disabled.png new file mode 100644 index 000000000..1a3d8a835 Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_0_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_0_indicator.png b/res/drawable-xhdpi/ic_exposure_0_indicator.png index 6444e0354..e4400f468 100644 Binary files a/res/drawable-xhdpi/ic_exposure_0_indicator.png and b/res/drawable-xhdpi/ic_exposure_0_indicator.png differ diff --git a/res/drawable-xhdpi/ic_exposure_disabled.png b/res/drawable-xhdpi/ic_exposure_disabled.png index 7612dfec6..ff399ae95 100644 Binary files a/res/drawable-xhdpi/ic_exposure_disabled.png and b/res/drawable-xhdpi/ic_exposure_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_indicator.png b/res/drawable-xhdpi/ic_exposure_indicator.png new file mode 100644 index 000000000..334203b04 Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_indicator.png differ diff --git a/res/drawable-xhdpi/ic_exposure_n1.png b/res/drawable-xhdpi/ic_exposure_n1.png index 257a5ded9..47c0213f3 100644 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_n1_disabled.png b/res/drawable-xhdpi/ic_exposure_n1_disabled.png new file mode 100644 index 000000000..95c9e6f85 Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_n1_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_n1_indicator.png b/res/drawable-xhdpi/ic_exposure_n1_indicator.png index e65852497..a06147d2c 100644 Binary files a/res/drawable-xhdpi/ic_exposure_n1_indicator.png and b/res/drawable-xhdpi/ic_exposure_n1_indicator.png differ diff --git a/res/drawable-xhdpi/ic_exposure_n2.png b/res/drawable-xhdpi/ic_exposure_n2.png index c320e2d53..c035c01b9 100644 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_n2_disabled.png b/res/drawable-xhdpi/ic_exposure_n2_disabled.png new file mode 100644 index 000000000..5e412be1e Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_n2_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_n2_indicator.png b/res/drawable-xhdpi/ic_exposure_n2_indicator.png index e9f9582b4..a5e865906 100644 Binary files a/res/drawable-xhdpi/ic_exposure_n2_indicator.png and b/res/drawable-xhdpi/ic_exposure_n2_indicator.png differ diff --git a/res/drawable-xhdpi/ic_exposure_normal.png b/res/drawable-xhdpi/ic_exposure_normal.png index 42858e321..ed7fa9fc5 100644 Binary files a/res/drawable-xhdpi/ic_exposure_normal.png and b/res/drawable-xhdpi/ic_exposure_normal.png differ diff --git a/res/drawable-xhdpi/ic_exposure_p1.png b/res/drawable-xhdpi/ic_exposure_p1.png index 4760d3b97..ebeb0cea5 100644 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_p1_disabled.png b/res/drawable-xhdpi/ic_exposure_p1_disabled.png new file mode 100644 index 000000000..482688adf Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_p1_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_p1_indicator.png b/res/drawable-xhdpi/ic_exposure_p1_indicator.png index 543777057..c5a2a532a 100644 Binary files a/res/drawable-xhdpi/ic_exposure_p1_indicator.png and b/res/drawable-xhdpi/ic_exposure_p1_indicator.png differ diff --git a/res/drawable-xhdpi/ic_exposure_p2.png b/res/drawable-xhdpi/ic_exposure_p2.png index b23d040b7..3580d63f4 100644 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_p2_disabled.png b/res/drawable-xhdpi/ic_exposure_p2_disabled.png new file mode 100644 index 000000000..4596cd99f Binary files /dev/null and b/res/drawable-xhdpi/ic_exposure_p2_disabled.png differ diff --git a/res/drawable-xhdpi/ic_exposure_p2_indicator.png b/res/drawable-xhdpi/ic_exposure_p2_indicator.png index 7c1be048a..b56b27097 100644 Binary files a/res/drawable-xhdpi/ic_exposure_p2_indicator.png and b/res/drawable-xhdpi/ic_exposure_p2_indicator.png differ diff --git a/res/drawable-xhdpi/ic_flash_auto_disabled.png b/res/drawable-xhdpi/ic_flash_auto_disabled.png index 331812a69..b9f149c24 100644 Binary files a/res/drawable-xhdpi/ic_flash_auto_disabled.png and b/res/drawable-xhdpi/ic_flash_auto_disabled.png differ diff --git a/res/drawable-xhdpi/ic_flash_auto_indicator.png b/res/drawable-xhdpi/ic_flash_auto_indicator.png index c599d98a6..526a65e28 100644 Binary files a/res/drawable-xhdpi/ic_flash_auto_indicator.png and b/res/drawable-xhdpi/ic_flash_auto_indicator.png differ diff --git a/res/drawable-xhdpi/ic_flash_auto_normal.png b/res/drawable-xhdpi/ic_flash_auto_normal.png index b1067c9be..5358ff5a9 100644 Binary files a/res/drawable-xhdpi/ic_flash_auto_normal.png and b/res/drawable-xhdpi/ic_flash_auto_normal.png differ diff --git a/res/drawable-xhdpi/ic_flash_off_disabled.png b/res/drawable-xhdpi/ic_flash_off_disabled.png index 5cbabadec..59b21a803 100644 Binary files a/res/drawable-xhdpi/ic_flash_off_disabled.png and b/res/drawable-xhdpi/ic_flash_off_disabled.png differ diff --git a/res/drawable-xhdpi/ic_flash_off_indicator.png b/res/drawable-xhdpi/ic_flash_off_indicator.png index 879374879..c047ff0a6 100644 Binary files a/res/drawable-xhdpi/ic_flash_off_indicator.png and b/res/drawable-xhdpi/ic_flash_off_indicator.png differ diff --git a/res/drawable-xhdpi/ic_flash_off_normal.png b/res/drawable-xhdpi/ic_flash_off_normal.png index b4789e3d8..84bce585c 100644 Binary files a/res/drawable-xhdpi/ic_flash_off_normal.png and b/res/drawable-xhdpi/ic_flash_off_normal.png differ diff --git a/res/drawable-xhdpi/ic_flash_on_disabled.png b/res/drawable-xhdpi/ic_flash_on_disabled.png index 8aaa2e319..181eb305c 100644 Binary files a/res/drawable-xhdpi/ic_flash_on_disabled.png and b/res/drawable-xhdpi/ic_flash_on_disabled.png differ diff --git a/res/drawable-xhdpi/ic_flash_on_indicator.png b/res/drawable-xhdpi/ic_flash_on_indicator.png index fb15711c8..ff413e61d 100644 Binary files a/res/drawable-xhdpi/ic_flash_on_indicator.png and b/res/drawable-xhdpi/ic_flash_on_indicator.png differ diff --git a/res/drawable-xhdpi/ic_flash_on_normal.png b/res/drawable-xhdpi/ic_flash_on_normal.png index e86b30170..ca8e11950 100644 Binary files a/res/drawable-xhdpi/ic_flash_on_normal.png and b/res/drawable-xhdpi/ic_flash_on_normal.png differ diff --git a/res/drawable-xhdpi/ic_grid_off_disabled.png b/res/drawable-xhdpi/ic_grid_off_disabled.png index 2c4e863c1..087801340 100644 Binary files a/res/drawable-xhdpi/ic_grid_off_disabled.png and b/res/drawable-xhdpi/ic_grid_off_disabled.png differ diff --git a/res/drawable-xhdpi/ic_grid_off_indicator.png b/res/drawable-xhdpi/ic_grid_off_indicator.png index 5a059663e..3570ef503 100644 Binary files a/res/drawable-xhdpi/ic_grid_off_indicator.png and b/res/drawable-xhdpi/ic_grid_off_indicator.png differ diff --git a/res/drawable-xhdpi/ic_grid_off_normal.png b/res/drawable-xhdpi/ic_grid_off_normal.png index ae0b17605..62a16bd17 100644 Binary files a/res/drawable-xhdpi/ic_grid_off_normal.png and b/res/drawable-xhdpi/ic_grid_off_normal.png differ diff --git a/res/drawable-xhdpi/ic_grid_on_disabled.png b/res/drawable-xhdpi/ic_grid_on_disabled.png index 661174d0c..22624b654 100644 Binary files a/res/drawable-xhdpi/ic_grid_on_disabled.png and b/res/drawable-xhdpi/ic_grid_on_disabled.png differ diff --git a/res/drawable-xhdpi/ic_grid_on_indicator.png b/res/drawable-xhdpi/ic_grid_on_indicator.png index 6e1ff89c7..4bf674ea4 100644 Binary files a/res/drawable-xhdpi/ic_grid_on_indicator.png and b/res/drawable-xhdpi/ic_grid_on_indicator.png differ diff --git a/res/drawable-xhdpi/ic_grid_on_normal.png b/res/drawable-xhdpi/ic_grid_on_normal.png index 2e0514d89..dcb58df6d 100644 Binary files a/res/drawable-xhdpi/ic_grid_on_normal.png and b/res/drawable-xhdpi/ic_grid_on_normal.png differ diff --git a/res/drawable-xhdpi/ic_hdr_off_disabled.png b/res/drawable-xhdpi/ic_hdr_off_disabled.png index 61e616cd0..0a6d6d7a7 100644 Binary files a/res/drawable-xhdpi/ic_hdr_off_disabled.png and b/res/drawable-xhdpi/ic_hdr_off_disabled.png differ diff --git a/res/drawable-xhdpi/ic_hdr_off_indicator.png b/res/drawable-xhdpi/ic_hdr_off_indicator.png index 527de2cca..f60f8e2dd 100644 Binary files a/res/drawable-xhdpi/ic_hdr_off_indicator.png and b/res/drawable-xhdpi/ic_hdr_off_indicator.png differ diff --git a/res/drawable-xhdpi/ic_hdr_off_normal.png b/res/drawable-xhdpi/ic_hdr_off_normal.png index ac26067a8..76d024d65 100644 Binary files a/res/drawable-xhdpi/ic_hdr_off_normal.png and b/res/drawable-xhdpi/ic_hdr_off_normal.png differ diff --git a/res/drawable-xhdpi/ic_hdr_on_disabled.png b/res/drawable-xhdpi/ic_hdr_on_disabled.png index fcc79113e..851276eb2 100644 Binary files a/res/drawable-xhdpi/ic_hdr_on_disabled.png and b/res/drawable-xhdpi/ic_hdr_on_disabled.png differ diff --git a/res/drawable-xhdpi/ic_hdr_on_indicator.png b/res/drawable-xhdpi/ic_hdr_on_indicator.png index 4218e5045..2668ce2c7 100644 Binary files a/res/drawable-xhdpi/ic_hdr_on_indicator.png and b/res/drawable-xhdpi/ic_hdr_on_indicator.png differ diff --git a/res/drawable-xhdpi/ic_hdr_on_normal.png b/res/drawable-xhdpi/ic_hdr_on_normal.png index cb3ae4130..0ade21b6d 100644 Binary files a/res/drawable-xhdpi/ic_hdr_on_normal.png and b/res/drawable-xhdpi/ic_hdr_on_normal.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png index 005cbabb4..759bdef79 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png and b/res/drawable-xhdpi/ic_hdr_plus_off_disabled.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png b/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png index d7454bf02..31bc25293 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png and b/res/drawable-xhdpi/ic_hdr_plus_off_indicator.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_off_normal.png b/res/drawable-xhdpi/ic_hdr_plus_off_normal.png index 5d5d76267..7a02b2c54 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_off_normal.png and b/res/drawable-xhdpi/ic_hdr_plus_off_normal.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png index 78e61d69f..fdd4d3b1a 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png and b/res/drawable-xhdpi/ic_hdr_plus_on_disabled.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png b/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png index c2ce46162..f61b9566e 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png and b/res/drawable-xhdpi/ic_hdr_plus_on_indicator.png differ diff --git a/res/drawable-xhdpi/ic_hdr_plus_on_normal.png b/res/drawable-xhdpi/ic_hdr_plus_on_normal.png index ad2891940..4306f2a0c 100644 Binary files a/res/drawable-xhdpi/ic_hdr_plus_on_normal.png and b/res/drawable-xhdpi/ic_hdr_plus_on_normal.png differ diff --git a/res/drawable-xhdpi/ic_panorama_disabled.png b/res/drawable-xhdpi/ic_panorama_disabled.png deleted file mode 100644 index 9b074051d..000000000 Binary files a/res/drawable-xhdpi/ic_panorama_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_photo_sphere_disabled.png b/res/drawable-xhdpi/ic_photo_sphere_disabled.png deleted file mode 100644 index 558bbe9a7..000000000 Binary files a/res/drawable-xhdpi/ic_photo_sphere_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_refocus_disabled.png b/res/drawable-xhdpi/ic_refocus_disabled.png deleted file mode 100644 index dda381857..000000000 Binary files a/res/drawable-xhdpi/ic_refocus_disabled.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_share_disabled.png b/res/drawable-xhdpi/ic_share_disabled.png index 71d3d81a5..dd01a879f 100644 Binary files a/res/drawable-xhdpi/ic_share_disabled.png and b/res/drawable-xhdpi/ic_share_disabled.png differ diff --git a/res/drawable-xhdpi/ic_share_normal.png b/res/drawable-xhdpi/ic_share_normal.png index 5963715e0..b0ddf237e 100644 Binary files a/res/drawable-xhdpi/ic_share_normal.png and b/res/drawable-xhdpi/ic_share_normal.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_back_disabled.png b/res/drawable-xhdpi/ic_switch_camera_back_disabled.png index 8f7f1923d..26ad3a535 100644 Binary files a/res/drawable-xhdpi/ic_switch_camera_back_disabled.png and b/res/drawable-xhdpi/ic_switch_camera_back_disabled.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xhdpi/ic_switch_camera_back_indicator.png new file mode 100644 index 000000000..a68dd654b Binary files /dev/null and b/res/drawable-xhdpi/ic_switch_camera_back_indicator.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_back_normal.png b/res/drawable-xhdpi/ic_switch_camera_back_normal.png index 4970deb95..32a37d7c8 100644 Binary files a/res/drawable-xhdpi/ic_switch_camera_back_normal.png and b/res/drawable-xhdpi/ic_switch_camera_back_normal.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_front_disabled.png b/res/drawable-xhdpi/ic_switch_camera_front_disabled.png index 4220c77dc..56fc8c4df 100644 Binary files a/res/drawable-xhdpi/ic_switch_camera_front_disabled.png and b/res/drawable-xhdpi/ic_switch_camera_front_disabled.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xhdpi/ic_switch_camera_front_indicator.png new file mode 100644 index 000000000..37baad5b6 Binary files /dev/null and b/res/drawable-xhdpi/ic_switch_camera_front_indicator.png differ diff --git a/res/drawable-xhdpi/ic_switch_camera_front_normal.png b/res/drawable-xhdpi/ic_switch_camera_front_normal.png index 7ee10978b..c1147b712 100644 Binary files a/res/drawable-xhdpi/ic_switch_camera_front_normal.png and b/res/drawable-xhdpi/ic_switch_camera_front_normal.png differ diff --git a/res/drawable-xhdpi/ic_timer_10s_disabled.png b/res/drawable-xhdpi/ic_timer_10s_disabled.png index cc73c7a0b..c68566861 100644 Binary files a/res/drawable-xhdpi/ic_timer_10s_disabled.png and b/res/drawable-xhdpi/ic_timer_10s_disabled.png differ diff --git a/res/drawable-xhdpi/ic_timer_10s_indicator.png b/res/drawable-xhdpi/ic_timer_10s_indicator.png index 0040e4b05..a8a005bf1 100644 Binary files a/res/drawable-xhdpi/ic_timer_10s_indicator.png and b/res/drawable-xhdpi/ic_timer_10s_indicator.png differ diff --git a/res/drawable-xhdpi/ic_timer_10s_normal.png b/res/drawable-xhdpi/ic_timer_10s_normal.png index d8104e053..4815dfd33 100644 Binary files a/res/drawable-xhdpi/ic_timer_10s_normal.png and b/res/drawable-xhdpi/ic_timer_10s_normal.png differ diff --git a/res/drawable-xhdpi/ic_timer_3s_disabled.png b/res/drawable-xhdpi/ic_timer_3s_disabled.png index 3fe1a2c49..b3cca5965 100644 Binary files a/res/drawable-xhdpi/ic_timer_3s_disabled.png and b/res/drawable-xhdpi/ic_timer_3s_disabled.png differ diff --git a/res/drawable-xhdpi/ic_timer_3s_indicator.png b/res/drawable-xhdpi/ic_timer_3s_indicator.png index 745c09f7b..ae46c8de6 100644 Binary files a/res/drawable-xhdpi/ic_timer_3s_indicator.png and b/res/drawable-xhdpi/ic_timer_3s_indicator.png differ diff --git a/res/drawable-xhdpi/ic_timer_3s_normal.png b/res/drawable-xhdpi/ic_timer_3s_normal.png index c3874ac62..982509c99 100644 Binary files a/res/drawable-xhdpi/ic_timer_3s_normal.png and b/res/drawable-xhdpi/ic_timer_3s_normal.png differ diff --git a/res/drawable-xhdpi/ic_timer_auto_disabled.png b/res/drawable-xhdpi/ic_timer_auto_disabled.png new file mode 100644 index 000000000..ab708b68a Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_auto_disabled.png differ diff --git a/res/drawable-xhdpi/ic_timer_auto_indicator.png b/res/drawable-xhdpi/ic_timer_auto_indicator.png new file mode 100644 index 000000000..c361b7635 Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_auto_indicator.png differ diff --git a/res/drawable-xhdpi/ic_timer_auto_normal.png b/res/drawable-xhdpi/ic_timer_auto_normal.png new file mode 100644 index 000000000..740c20587 Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_auto_normal.png differ diff --git a/res/drawable-xhdpi/ic_timer_off_disabled.png b/res/drawable-xhdpi/ic_timer_off_disabled.png index 7ceb53a88..f053bdf0b 100644 Binary files a/res/drawable-xhdpi/ic_timer_off_disabled.png and b/res/drawable-xhdpi/ic_timer_off_disabled.png differ diff --git a/res/drawable-xhdpi/ic_timer_off_indicator.png b/res/drawable-xhdpi/ic_timer_off_indicator.png index 7e6272d43..9fd61bdfb 100644 Binary files a/res/drawable-xhdpi/ic_timer_off_indicator.png and b/res/drawable-xhdpi/ic_timer_off_indicator.png differ diff --git a/res/drawable-xhdpi/ic_timer_off_normal.png b/res/drawable-xhdpi/ic_timer_off_normal.png index b6554f1fd..7341cd0cd 100644 Binary files a/res/drawable-xhdpi/ic_timer_off_normal.png and b/res/drawable-xhdpi/ic_timer_off_normal.png differ diff --git a/res/drawable-xhdpi/ic_trash_disabled.png b/res/drawable-xhdpi/ic_trash_disabled.png new file mode 100644 index 000000000..efd17a273 Binary files /dev/null and b/res/drawable-xhdpi/ic_trash_disabled.png differ diff --git a/res/drawable-xhdpi/ic_trash_normal.png b/res/drawable-xhdpi/ic_trash_normal.png new file mode 100644 index 000000000..fbe023eb2 Binary files /dev/null and b/res/drawable-xhdpi/ic_trash_normal.png differ diff --git a/res/drawable-xhdpi/ic_video_blanket.png b/res/drawable-xhdpi/ic_video_blanket.png new file mode 100644 index 000000000..da017fdec Binary files /dev/null and b/res/drawable-xhdpi/ic_video_blanket.png differ diff --git a/res/drawable-xhdpi/ic_video_disabled.png b/res/drawable-xhdpi/ic_video_disabled.png new file mode 100644 index 000000000..e2bb06c80 Binary files /dev/null and b/res/drawable-xhdpi/ic_video_disabled.png differ diff --git a/res/drawable-xhdpi/ic_video_normal.png b/res/drawable-xhdpi/ic_video_normal.png new file mode 100644 index 000000000..8a1864039 Binary files /dev/null and b/res/drawable-xhdpi/ic_video_normal.png differ diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png index 6ef1e4ca9..66c85b59c 100644 Binary files a/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png and b/res/drawable-xxhdpi/aspect_ratio_16x9_selected.png differ diff --git a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png index 1e4937a5e..27024fc17 100644 Binary files a/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png and b/res/drawable-xxhdpi/aspect_ratio_16x9_unselected.png differ diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png index 9fc55d872..47ee93028 100644 Binary files a/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png and b/res/drawable-xxhdpi/aspect_ratio_4x3_selected.png differ diff --git a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png index a72be3d83..d758eb996 100644 Binary files a/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png and b/res/drawable-xxhdpi/aspect_ratio_4x3_unselected.png differ diff --git a/res/drawable-xxhdpi/geo_opt_in_graphic.png b/res/drawable-xxhdpi/geo_opt_in_graphic.png index 6144b1b62..8f29861d1 100644 Binary files a/res/drawable-xxhdpi/geo_opt_in_graphic.png and b/res/drawable-xxhdpi/geo_opt_in_graphic.png differ diff --git a/res/drawable-xxhdpi/ic_camera_blanket.png b/res/drawable-xxhdpi/ic_camera_blanket.png new file mode 100644 index 000000000..1799adcc3 Binary files /dev/null and b/res/drawable-xxhdpi/ic_camera_blanket.png differ diff --git a/res/drawable-xxhdpi/ic_camera_disabled.png b/res/drawable-xxhdpi/ic_camera_disabled.png index 9165d50af..7a0921331 100644 Binary files a/res/drawable-xxhdpi/ic_camera_disabled.png and b/res/drawable-xxhdpi/ic_camera_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_camera_normal.png b/res/drawable-xxhdpi/ic_camera_normal.png new file mode 100644 index 000000000..d24dc7312 Binary files /dev/null and b/res/drawable-xxhdpi/ic_camera_normal.png differ diff --git a/res/drawable-xxhdpi/ic_capture_camera_disabled.png b/res/drawable-xxhdpi/ic_capture_camera_disabled.png new file mode 100644 index 000000000..b5f3d7299 Binary files /dev/null and b/res/drawable-xxhdpi/ic_capture_camera_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_capture_camera_normal.png b/res/drawable-xxhdpi/ic_capture_camera_normal.png new file mode 100644 index 000000000..a82cafc4c Binary files /dev/null and b/res/drawable-xxhdpi/ic_capture_camera_normal.png differ diff --git a/res/drawable-xxhdpi/ic_capture_video.png b/res/drawable-xxhdpi/ic_capture_video.png new file mode 100644 index 000000000..685df78f8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_capture_video.png differ diff --git a/res/drawable-xxhdpi/ic_capture_video_disabled.png b/res/drawable-xxhdpi/ic_capture_video_disabled.png new file mode 100644 index 000000000..1e9b29507 Binary files /dev/null and b/res/drawable-xxhdpi/ic_capture_video_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_done_disabled.png b/res/drawable-xxhdpi/ic_done_disabled.png new file mode 100644 index 000000000..1da358daf Binary files /dev/null and b/res/drawable-xxhdpi/ic_done_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_done_normal.png b/res/drawable-xxhdpi/ic_done_normal.png new file mode 100644 index 000000000..4bf940691 Binary files /dev/null and b/res/drawable-xxhdpi/ic_done_normal.png differ diff --git a/res/drawable-xxhdpi/ic_edit_disabled.png b/res/drawable-xxhdpi/ic_edit_disabled.png index 2b0f928a1..4b5c33a0c 100644 Binary files a/res/drawable-xxhdpi/ic_edit_disabled.png and b/res/drawable-xxhdpi/ic_edit_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_edit_normal.png b/res/drawable-xxhdpi/ic_edit_normal.png index d1e9fbd76..55fb5ef32 100644 Binary files a/res/drawable-xxhdpi/ic_edit_normal.png and b/res/drawable-xxhdpi/ic_edit_normal.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_0.png b/res/drawable-xxhdpi/ic_exposure_0.png index 0a6370108..1605d1eaa 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_0.png and b/res/drawable-xxhdpi/ic_exposure_0.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_0_disabled.png b/res/drawable-xxhdpi/ic_exposure_0_disabled.png new file mode 100644 index 000000000..281f255b8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_0_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_0_indicator.png b/res/drawable-xxhdpi/ic_exposure_0_indicator.png index 591991674..5f6479c50 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_0_indicator.png and b/res/drawable-xxhdpi/ic_exposure_0_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_disabled.png b/res/drawable-xxhdpi/ic_exposure_disabled.png index b9d7d5a9b..e57d41d72 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_disabled.png and b/res/drawable-xxhdpi/ic_exposure_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_indicator.png b/res/drawable-xxhdpi/ic_exposure_indicator.png new file mode 100644 index 000000000..a8b867940 Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n1.png b/res/drawable-xxhdpi/ic_exposure_n1.png index b4c7d3a75..3325ce335 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_n1.png and b/res/drawable-xxhdpi/ic_exposure_n1.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n1_disabled.png b/res/drawable-xxhdpi/ic_exposure_n1_disabled.png new file mode 100644 index 000000000..9e2c44e94 Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_n1_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n1_indicator.png b/res/drawable-xxhdpi/ic_exposure_n1_indicator.png index 8b9173408..385b8afd8 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_n1_indicator.png and b/res/drawable-xxhdpi/ic_exposure_n1_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n2.png b/res/drawable-xxhdpi/ic_exposure_n2.png index 929d73373..4e0f61223 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_n2.png and b/res/drawable-xxhdpi/ic_exposure_n2.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n2_disabled.png b/res/drawable-xxhdpi/ic_exposure_n2_disabled.png new file mode 100644 index 000000000..5b021893a Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_n2_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_n2_indicator.png b/res/drawable-xxhdpi/ic_exposure_n2_indicator.png index 060dd8165..c7ccfee59 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_n2_indicator.png and b/res/drawable-xxhdpi/ic_exposure_n2_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_normal.png b/res/drawable-xxhdpi/ic_exposure_normal.png index 1ebc71cdd..1d48c5829 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_normal.png and b/res/drawable-xxhdpi/ic_exposure_normal.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p1.png b/res/drawable-xxhdpi/ic_exposure_p1.png index f854db48e..b98c64cea 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_p1.png and b/res/drawable-xxhdpi/ic_exposure_p1.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p1_disabled.png b/res/drawable-xxhdpi/ic_exposure_p1_disabled.png new file mode 100644 index 000000000..f89bf7e56 Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_p1_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p1_indicator.png b/res/drawable-xxhdpi/ic_exposure_p1_indicator.png index c03a20e64..f6478212b 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_p1_indicator.png and b/res/drawable-xxhdpi/ic_exposure_p1_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p2.png b/res/drawable-xxhdpi/ic_exposure_p2.png index 346d8d894..2816f8d01 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_p2.png and b/res/drawable-xxhdpi/ic_exposure_p2.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p2_disabled.png b/res/drawable-xxhdpi/ic_exposure_p2_disabled.png new file mode 100644 index 000000000..c81205433 Binary files /dev/null and b/res/drawable-xxhdpi/ic_exposure_p2_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_exposure_p2_indicator.png b/res/drawable-xxhdpi/ic_exposure_p2_indicator.png index dd4420a3d..43c24eb90 100644 Binary files a/res/drawable-xxhdpi/ic_exposure_p2_indicator.png and b/res/drawable-xxhdpi/ic_exposure_p2_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_flash_auto_disabled.png b/res/drawable-xxhdpi/ic_flash_auto_disabled.png index aec5d088f..ce2c0ef05 100644 Binary files a/res/drawable-xxhdpi/ic_flash_auto_disabled.png and b/res/drawable-xxhdpi/ic_flash_auto_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_flash_auto_indicator.png b/res/drawable-xxhdpi/ic_flash_auto_indicator.png index 65dcf1beb..41a9e7294 100644 Binary files a/res/drawable-xxhdpi/ic_flash_auto_indicator.png and b/res/drawable-xxhdpi/ic_flash_auto_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_flash_auto_normal.png b/res/drawable-xxhdpi/ic_flash_auto_normal.png index 48bdba36f..27b968a7b 100644 Binary files a/res/drawable-xxhdpi/ic_flash_auto_normal.png and b/res/drawable-xxhdpi/ic_flash_auto_normal.png differ diff --git a/res/drawable-xxhdpi/ic_flash_off_disabled.png b/res/drawable-xxhdpi/ic_flash_off_disabled.png index a4d070b11..2054f6e3c 100644 Binary files a/res/drawable-xxhdpi/ic_flash_off_disabled.png and b/res/drawable-xxhdpi/ic_flash_off_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_flash_off_indicator.png b/res/drawable-xxhdpi/ic_flash_off_indicator.png index 5aa096c44..09bc42102 100644 Binary files a/res/drawable-xxhdpi/ic_flash_off_indicator.png and b/res/drawable-xxhdpi/ic_flash_off_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_flash_off_normal.png b/res/drawable-xxhdpi/ic_flash_off_normal.png index 33a372c7c..c60e85513 100644 Binary files a/res/drawable-xxhdpi/ic_flash_off_normal.png and b/res/drawable-xxhdpi/ic_flash_off_normal.png differ diff --git a/res/drawable-xxhdpi/ic_flash_on_disabled.png b/res/drawable-xxhdpi/ic_flash_on_disabled.png index 7db39d5a0..1997f867a 100644 Binary files a/res/drawable-xxhdpi/ic_flash_on_disabled.png and b/res/drawable-xxhdpi/ic_flash_on_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_flash_on_indicator.png b/res/drawable-xxhdpi/ic_flash_on_indicator.png index 4177f6572..619ca60c5 100644 Binary files a/res/drawable-xxhdpi/ic_flash_on_indicator.png and b/res/drawable-xxhdpi/ic_flash_on_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_flash_on_normal.png b/res/drawable-xxhdpi/ic_flash_on_normal.png index 660ff6062..e2fb9d061 100644 Binary files a/res/drawable-xxhdpi/ic_flash_on_normal.png and b/res/drawable-xxhdpi/ic_flash_on_normal.png differ diff --git a/res/drawable-xxhdpi/ic_grid_off_disabled.png b/res/drawable-xxhdpi/ic_grid_off_disabled.png index d3bda522a..87233a1db 100644 Binary files a/res/drawable-xxhdpi/ic_grid_off_disabled.png and b/res/drawable-xxhdpi/ic_grid_off_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_grid_off_indicator.png b/res/drawable-xxhdpi/ic_grid_off_indicator.png index 15058709a..3bad20290 100644 Binary files a/res/drawable-xxhdpi/ic_grid_off_indicator.png and b/res/drawable-xxhdpi/ic_grid_off_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_grid_off_normal.png b/res/drawable-xxhdpi/ic_grid_off_normal.png index dc5af05d5..0225ff76f 100644 Binary files a/res/drawable-xxhdpi/ic_grid_off_normal.png and b/res/drawable-xxhdpi/ic_grid_off_normal.png differ diff --git a/res/drawable-xxhdpi/ic_grid_on_disabled.png b/res/drawable-xxhdpi/ic_grid_on_disabled.png index 2f0eefd5c..3fa8b2b6c 100644 Binary files a/res/drawable-xxhdpi/ic_grid_on_disabled.png and b/res/drawable-xxhdpi/ic_grid_on_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_grid_on_indicator.png b/res/drawable-xxhdpi/ic_grid_on_indicator.png index 381942f88..4838e1c34 100644 Binary files a/res/drawable-xxhdpi/ic_grid_on_indicator.png and b/res/drawable-xxhdpi/ic_grid_on_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_grid_on_normal.png b/res/drawable-xxhdpi/ic_grid_on_normal.png index 7afea3580..1d0067b37 100644 Binary files a/res/drawable-xxhdpi/ic_grid_on_normal.png and b/res/drawable-xxhdpi/ic_grid_on_normal.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_off_disabled.png b/res/drawable-xxhdpi/ic_hdr_off_disabled.png index f29ab46e3..1d36659ba 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_off_disabled.png and b/res/drawable-xxhdpi/ic_hdr_off_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_off_indicator.png b/res/drawable-xxhdpi/ic_hdr_off_indicator.png index 640d90312..2a3845eae 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_off_indicator.png and b/res/drawable-xxhdpi/ic_hdr_off_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_off_normal.png b/res/drawable-xxhdpi/ic_hdr_off_normal.png index 227d17377..d730c256b 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_off_normal.png and b/res/drawable-xxhdpi/ic_hdr_off_normal.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_on_disabled.png b/res/drawable-xxhdpi/ic_hdr_on_disabled.png index 0abd17ad5..e7fcb3b56 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_on_disabled.png and b/res/drawable-xxhdpi/ic_hdr_on_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_on_indicator.png b/res/drawable-xxhdpi/ic_hdr_on_indicator.png index eb44d4310..f002056ba 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_on_indicator.png and b/res/drawable-xxhdpi/ic_hdr_on_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_on_normal.png b/res/drawable-xxhdpi/ic_hdr_on_normal.png index 879e53d36..dcb5090b1 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_on_normal.png and b/res/drawable-xxhdpi/ic_hdr_on_normal.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png index 0ad52ddb0..56fb34158 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png and b/res/drawable-xxhdpi/ic_hdr_plus_off_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png b/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png index 4d5e0462c..806f3d5f2 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png and b/res/drawable-xxhdpi/ic_hdr_plus_off_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png index 8103f8bf1..5324753fe 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png and b/res/drawable-xxhdpi/ic_hdr_plus_off_normal.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png index 37ce48189..1d25617eb 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png and b/res/drawable-xxhdpi/ic_hdr_plus_on_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png b/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png index 5999ba264..ccd9d89ce 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png and b/res/drawable-xxhdpi/ic_hdr_plus_on_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png index 6fb726c79..534012d25 100644 Binary files a/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png and b/res/drawable-xxhdpi/ic_hdr_plus_on_normal.png differ diff --git a/res/drawable-xxhdpi/ic_panorama_disabled.png b/res/drawable-xxhdpi/ic_panorama_disabled.png deleted file mode 100644 index b0646880b..000000000 Binary files a/res/drawable-xxhdpi/ic_panorama_disabled.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_photo_sphere_disabled.png b/res/drawable-xxhdpi/ic_photo_sphere_disabled.png deleted file mode 100644 index 11e2b44e4..000000000 Binary files a/res/drawable-xxhdpi/ic_photo_sphere_disabled.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_refocus_disabled.png b/res/drawable-xxhdpi/ic_refocus_disabled.png index 333821809..b07a573ca 100644 Binary files a/res/drawable-xxhdpi/ic_refocus_disabled.png and b/res/drawable-xxhdpi/ic_refocus_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_refocus_normal.png b/res/drawable-xxhdpi/ic_refocus_normal.png new file mode 100644 index 000000000..b65de73c7 Binary files /dev/null and b/res/drawable-xxhdpi/ic_refocus_normal.png differ diff --git a/res/drawable-xxhdpi/ic_share_disabled.png b/res/drawable-xxhdpi/ic_share_disabled.png index 3a4a49bce..4334ea646 100644 Binary files a/res/drawable-xxhdpi/ic_share_disabled.png and b/res/drawable-xxhdpi/ic_share_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_share_normal.png b/res/drawable-xxhdpi/ic_share_normal.png index d50a4fa4d..75e732a9e 100644 Binary files a/res/drawable-xxhdpi/ic_share_normal.png and b/res/drawable-xxhdpi/ic_share_normal.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png b/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png index 5a91f9cff..c2f03508e 100644 Binary files a/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png and b/res/drawable-xxhdpi/ic_switch_camera_back_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png new file mode 100644 index 000000000..6e3e9304b Binary files /dev/null and b/res/drawable-xxhdpi/ic_switch_camera_back_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_back_normal.png b/res/drawable-xxhdpi/ic_switch_camera_back_normal.png index ee4f2e284..e351a35a9 100644 Binary files a/res/drawable-xxhdpi/ic_switch_camera_back_normal.png and b/res/drawable-xxhdpi/ic_switch_camera_back_normal.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png b/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png index b04bb3d1c..1fe42d5d5 100644 Binary files a/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png and b/res/drawable-xxhdpi/ic_switch_camera_front_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png new file mode 100644 index 000000000..a5e0529cd Binary files /dev/null and b/res/drawable-xxhdpi/ic_switch_camera_front_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_switch_camera_front_normal.png b/res/drawable-xxhdpi/ic_switch_camera_front_normal.png index d35b9547b..700ca5055 100644 Binary files a/res/drawable-xxhdpi/ic_switch_camera_front_normal.png and b/res/drawable-xxhdpi/ic_switch_camera_front_normal.png differ diff --git a/res/drawable-xxhdpi/ic_timer_10s_disabled.png b/res/drawable-xxhdpi/ic_timer_10s_disabled.png index bb8449644..5c8081351 100644 Binary files a/res/drawable-xxhdpi/ic_timer_10s_disabled.png and b/res/drawable-xxhdpi/ic_timer_10s_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_timer_10s_indicator.png b/res/drawable-xxhdpi/ic_timer_10s_indicator.png index 399456576..8cbfe4e56 100644 Binary files a/res/drawable-xxhdpi/ic_timer_10s_indicator.png and b/res/drawable-xxhdpi/ic_timer_10s_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_timer_10s_normal.png b/res/drawable-xxhdpi/ic_timer_10s_normal.png index 61fffec85..d759442a0 100644 Binary files a/res/drawable-xxhdpi/ic_timer_10s_normal.png and b/res/drawable-xxhdpi/ic_timer_10s_normal.png differ diff --git a/res/drawable-xxhdpi/ic_timer_3s_disabled.png b/res/drawable-xxhdpi/ic_timer_3s_disabled.png index f67c754ce..eb67383d3 100644 Binary files a/res/drawable-xxhdpi/ic_timer_3s_disabled.png and b/res/drawable-xxhdpi/ic_timer_3s_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_timer_3s_indicator.png b/res/drawable-xxhdpi/ic_timer_3s_indicator.png index 7b0c5d3fd..9e27664dc 100644 Binary files a/res/drawable-xxhdpi/ic_timer_3s_indicator.png and b/res/drawable-xxhdpi/ic_timer_3s_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_timer_3s_normal.png b/res/drawable-xxhdpi/ic_timer_3s_normal.png index a4a7bf9c0..5965cf510 100644 Binary files a/res/drawable-xxhdpi/ic_timer_3s_normal.png and b/res/drawable-xxhdpi/ic_timer_3s_normal.png differ diff --git a/res/drawable-xxhdpi/ic_timer_auto_disabled.png b/res/drawable-xxhdpi/ic_timer_auto_disabled.png new file mode 100644 index 000000000..527efc2ad Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_auto_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_timer_auto_indicator.png b/res/drawable-xxhdpi/ic_timer_auto_indicator.png new file mode 100644 index 000000000..dc2ed0268 Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_auto_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_timer_auto_normal.png b/res/drawable-xxhdpi/ic_timer_auto_normal.png new file mode 100644 index 000000000..2bafa3bb1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_auto_normal.png differ diff --git a/res/drawable-xxhdpi/ic_timer_off_disabled.png b/res/drawable-xxhdpi/ic_timer_off_disabled.png index d617e79fb..10d2b36d9 100644 Binary files a/res/drawable-xxhdpi/ic_timer_off_disabled.png and b/res/drawable-xxhdpi/ic_timer_off_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_timer_off_indicator.png b/res/drawable-xxhdpi/ic_timer_off_indicator.png index 21acf8ca4..c913fc7c9 100644 Binary files a/res/drawable-xxhdpi/ic_timer_off_indicator.png and b/res/drawable-xxhdpi/ic_timer_off_indicator.png differ diff --git a/res/drawable-xxhdpi/ic_timer_off_normal.png b/res/drawable-xxhdpi/ic_timer_off_normal.png index 935b7cef1..a1da31d66 100644 Binary files a/res/drawable-xxhdpi/ic_timer_off_normal.png and b/res/drawable-xxhdpi/ic_timer_off_normal.png differ diff --git a/res/drawable-xxhdpi/ic_trash_disabled.png b/res/drawable-xxhdpi/ic_trash_disabled.png new file mode 100644 index 000000000..7bd26e7af Binary files /dev/null and b/res/drawable-xxhdpi/ic_trash_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_trash_normal.png b/res/drawable-xxhdpi/ic_trash_normal.png new file mode 100644 index 000000000..dbbe31740 Binary files /dev/null and b/res/drawable-xxhdpi/ic_trash_normal.png differ diff --git a/res/drawable-xxhdpi/ic_video_blanket.png b/res/drawable-xxhdpi/ic_video_blanket.png new file mode 100644 index 000000000..60504378f Binary files /dev/null and b/res/drawable-xxhdpi/ic_video_blanket.png differ diff --git a/res/drawable-xxhdpi/ic_video_disabled.png b/res/drawable-xxhdpi/ic_video_disabled.png new file mode 100644 index 000000000..86e6da66d Binary files /dev/null and b/res/drawable-xxhdpi/ic_video_disabled.png differ diff --git a/res/drawable-xxhdpi/ic_video_normal.png b/res/drawable-xxhdpi/ic_video_normal.png new file mode 100644 index 000000000..9eedd352d Binary files /dev/null and b/res/drawable-xxhdpi/ic_video_normal.png differ diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png b/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png new file mode 100644 index 000000000..6b1dfa8bf Binary files /dev/null and b/res/drawable-xxxhdpi/aspect_ratio_16x9_selected.png differ diff --git a/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png b/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png new file mode 100644 index 000000000..4d9235b4d Binary files /dev/null and b/res/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png differ diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png b/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png new file mode 100644 index 000000000..a3bfeff5e Binary files /dev/null and b/res/drawable-xxxhdpi/aspect_ratio_4x3_selected.png differ diff --git a/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png b/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png new file mode 100644 index 000000000..7e343e2fd Binary files /dev/null and b/res/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png differ diff --git a/res/drawable-xxxhdpi/geo_opt_in_graphic.png b/res/drawable-xxxhdpi/geo_opt_in_graphic.png new file mode 100644 index 000000000..63b47738b Binary files /dev/null and b/res/drawable-xxxhdpi/geo_opt_in_graphic.png differ diff --git a/res/drawable-xxxhdpi/ic_camera_blanket.png b/res/drawable-xxxhdpi/ic_camera_blanket.png new file mode 100644 index 000000000..a896d466b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_camera_blanket.png differ diff --git a/res/drawable-xxxhdpi/ic_camera_disabled.png b/res/drawable-xxxhdpi/ic_camera_disabled.png new file mode 100644 index 000000000..af0888d71 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_camera_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_camera_normal.png b/res/drawable-xxxhdpi/ic_camera_normal.png new file mode 100644 index 000000000..aeed3bd3b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_camera_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_camera_disabled.png b/res/drawable-xxxhdpi/ic_capture_camera_disabled.png new file mode 100644 index 000000000..46d4bd73d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_camera_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_camera_normal.png b/res/drawable-xxxhdpi/ic_capture_camera_normal.png new file mode 100644 index 000000000..8ba74d6d0 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_camera_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_pano.png b/res/drawable-xxxhdpi/ic_capture_pano.png new file mode 100644 index 000000000..8ab9b1346 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_pano.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_pano_disabled.png b/res/drawable-xxxhdpi/ic_capture_pano_disabled.png new file mode 100644 index 000000000..034fafed3 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_pano_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_refocus.png b/res/drawable-xxxhdpi/ic_capture_refocus.png new file mode 100644 index 000000000..107adbdb7 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_refocus.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_refocus_disabled.png b/res/drawable-xxxhdpi/ic_capture_refocus_disabled.png new file mode 100644 index 000000000..993fa01a5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_refocus_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_video.png b/res/drawable-xxxhdpi/ic_capture_video.png new file mode 100644 index 000000000..bddc23848 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_video.png differ diff --git a/res/drawable-xxxhdpi/ic_capture_video_disabled.png b/res/drawable-xxxhdpi/ic_capture_video_disabled.png new file mode 100644 index 000000000..bca96ec56 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_capture_video_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_edit_disabled.png b/res/drawable-xxxhdpi/ic_edit_disabled.png new file mode 100644 index 000000000..268e34b7a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_edit_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_edit_normal.png b/res/drawable-xxxhdpi/ic_edit_normal.png new file mode 100644 index 000000000..91725d310 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_edit_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_0.png b/res/drawable-xxxhdpi/ic_exposure_0.png new file mode 100644 index 000000000..cb14fa503 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_0.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_0_disabled.png b/res/drawable-xxxhdpi/ic_exposure_0_disabled.png new file mode 100644 index 000000000..9b83330ed Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_0_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_0_indicator.png b/res/drawable-xxxhdpi/ic_exposure_0_indicator.png new file mode 100644 index 000000000..700b011a4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_0_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_disabled.png b/res/drawable-xxxhdpi/ic_exposure_disabled.png new file mode 100644 index 000000000..68a35ec22 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_indicator.png b/res/drawable-xxxhdpi/ic_exposure_indicator.png new file mode 100644 index 000000000..72d418b76 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n1.png b/res/drawable-xxxhdpi/ic_exposure_n1.png new file mode 100644 index 000000000..a1020e40c Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n1.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png b/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png new file mode 100644 index 000000000..4a3acbedd Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n1_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n1_indicator.png b/res/drawable-xxxhdpi/ic_exposure_n1_indicator.png new file mode 100644 index 000000000..1d92998c1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n1_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n2.png b/res/drawable-xxxhdpi/ic_exposure_n2.png new file mode 100644 index 000000000..b9d2ecfd9 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n2.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png b/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png new file mode 100644 index 000000000..391b63c11 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n2_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_n2_indicator.png b/res/drawable-xxxhdpi/ic_exposure_n2_indicator.png new file mode 100644 index 000000000..cb68773af Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_n2_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_normal.png b/res/drawable-xxxhdpi/ic_exposure_normal.png new file mode 100644 index 000000000..2e3f980f4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p1.png b/res/drawable-xxxhdpi/ic_exposure_p1.png new file mode 100644 index 000000000..d1dfb4012 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p1.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png b/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png new file mode 100644 index 000000000..5e93cd9e6 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p1_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p1_indicator.png b/res/drawable-xxxhdpi/ic_exposure_p1_indicator.png new file mode 100644 index 000000000..3712b1503 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p1_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p2.png b/res/drawable-xxxhdpi/ic_exposure_p2.png new file mode 100644 index 000000000..242c2f449 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p2.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png b/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png new file mode 100644 index 000000000..0bb19b71c Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p2_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_exposure_p2_indicator.png b/res/drawable-xxxhdpi/ic_exposure_p2_indicator.png new file mode 100644 index 000000000..5b34fdfcb Binary files /dev/null and b/res/drawable-xxxhdpi/ic_exposure_p2_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_auto_disabled.png b/res/drawable-xxxhdpi/ic_flash_auto_disabled.png new file mode 100644 index 000000000..2f884e1aa Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_auto_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_auto_indicator.png b/res/drawable-xxxhdpi/ic_flash_auto_indicator.png new file mode 100644 index 000000000..d6d4723ab Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_auto_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_auto_normal.png b/res/drawable-xxxhdpi/ic_flash_auto_normal.png new file mode 100644 index 000000000..57a255d7f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_auto_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_off_disabled.png b/res/drawable-xxxhdpi/ic_flash_off_disabled.png new file mode 100644 index 000000000..5e55c7bb1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_off_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_off_indicator.png b/res/drawable-xxxhdpi/ic_flash_off_indicator.png new file mode 100644 index 000000000..882d7defb Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_off_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_off_normal.png b/res/drawable-xxxhdpi/ic_flash_off_normal.png new file mode 100644 index 000000000..390ab0cf4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_off_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_on_disabled.png b/res/drawable-xxxhdpi/ic_flash_on_disabled.png new file mode 100644 index 000000000..1b1457e4f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_on_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_on_indicator.png b/res/drawable-xxxhdpi/ic_flash_on_indicator.png new file mode 100644 index 000000000..ca24d8680 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_on_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_flash_on_normal.png b/res/drawable-xxxhdpi/ic_flash_on_normal.png new file mode 100644 index 000000000..8042537ff Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flash_on_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_off_disabled.png b/res/drawable-xxxhdpi/ic_grid_off_disabled.png new file mode 100644 index 000000000..cfe8b6165 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_off_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_off_indicator.png b/res/drawable-xxxhdpi/ic_grid_off_indicator.png new file mode 100644 index 000000000..cdce73ff8 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_off_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_off_normal.png b/res/drawable-xxxhdpi/ic_grid_off_normal.png new file mode 100644 index 000000000..c73c1f174 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_off_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_on_disabled.png b/res/drawable-xxxhdpi/ic_grid_on_disabled.png new file mode 100644 index 000000000..58ff1fe19 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_on_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_on_indicator.png b/res/drawable-xxxhdpi/ic_grid_on_indicator.png new file mode 100644 index 000000000..ab2c31eff Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_on_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_grid_on_normal.png b/res/drawable-xxxhdpi/ic_grid_on_normal.png new file mode 100644 index 000000000..c7fd7e566 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_grid_on_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_off_disabled.png b/res/drawable-xxxhdpi/ic_hdr_off_disabled.png new file mode 100644 index 000000000..603eb56b1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_off_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_off_indicator.png b/res/drawable-xxxhdpi/ic_hdr_off_indicator.png new file mode 100644 index 000000000..f76250b2a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_off_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_off_normal.png b/res/drawable-xxxhdpi/ic_hdr_off_normal.png new file mode 100644 index 000000000..9b4a03aa4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_off_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_on_disabled.png b/res/drawable-xxxhdpi/ic_hdr_on_disabled.png new file mode 100644 index 000000000..945f880c2 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_on_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_on_indicator.png b/res/drawable-xxxhdpi/ic_hdr_on_indicator.png new file mode 100644 index 000000000..a1869d560 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_on_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_on_normal.png b/res/drawable-xxxhdpi/ic_hdr_on_normal.png new file mode 100644 index 000000000..6f371d79f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_on_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png b/res/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png new file mode 100644 index 000000000..bb84f23ac Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png b/res/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png new file mode 100644 index 000000000..6e48d6913 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_off_normal.png b/res/drawable-xxxhdpi/ic_hdr_plus_off_normal.png new file mode 100644 index 000000000..1515543c3 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_off_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png b/res/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png new file mode 100644 index 000000000..8666dcccd Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png b/res/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png new file mode 100644 index 000000000..91352fe51 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_hdr_plus_on_normal.png b/res/drawable-xxxhdpi/ic_hdr_plus_on_normal.png new file mode 100644 index 000000000..6e2936226 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hdr_plus_on_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_share_disabled.png b/res/drawable-xxxhdpi/ic_share_disabled.png new file mode 100644 index 000000000..704b67f33 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_share_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_share_normal.png b/res/drawable-xxxhdpi/ic_share_normal.png new file mode 100644 index 000000000..dfb49ec4a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_share_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_back_disabled.png b/res/drawable-xxxhdpi/ic_switch_camera_back_disabled.png new file mode 100644 index 000000000..4b340bbe5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_back_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png b/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png new file mode 100644 index 000000000..80fa60cd4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_back_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_back_normal.png b/res/drawable-xxxhdpi/ic_switch_camera_back_normal.png new file mode 100644 index 000000000..771212dc3 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_back_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_front_disabled.png b/res/drawable-xxxhdpi/ic_switch_camera_front_disabled.png new file mode 100644 index 000000000..658da633d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_front_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png b/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png new file mode 100644 index 000000000..d19631d5c Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_front_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_switch_camera_front_normal.png b/res/drawable-xxxhdpi/ic_switch_camera_front_normal.png new file mode 100644 index 000000000..aad537f9f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_switch_camera_front_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_10s_disabled.png b/res/drawable-xxxhdpi/ic_timer_10s_disabled.png new file mode 100644 index 000000000..1858e1bc6 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_10s_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_10s_indicator.png b/res/drawable-xxxhdpi/ic_timer_10s_indicator.png new file mode 100644 index 000000000..37b91b751 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_10s_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_10s_normal.png b/res/drawable-xxxhdpi/ic_timer_10s_normal.png new file mode 100644 index 000000000..aefcbb134 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_10s_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_3s_disabled.png b/res/drawable-xxxhdpi/ic_timer_3s_disabled.png new file mode 100644 index 000000000..377d1a1c1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_3s_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_3s_indicator.png b/res/drawable-xxxhdpi/ic_timer_3s_indicator.png new file mode 100644 index 000000000..475aec290 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_3s_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_3s_normal.png b/res/drawable-xxxhdpi/ic_timer_3s_normal.png new file mode 100644 index 000000000..dbbf9c3d6 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_3s_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_auto_disabled.png b/res/drawable-xxxhdpi/ic_timer_auto_disabled.png new file mode 100644 index 000000000..bd02146d3 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_auto_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_auto_indicator.png b/res/drawable-xxxhdpi/ic_timer_auto_indicator.png new file mode 100644 index 000000000..6e8118bf0 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_auto_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_auto_normal.png b/res/drawable-xxxhdpi/ic_timer_auto_normal.png new file mode 100644 index 000000000..aa9e6f111 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_auto_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_off_disabled.png b/res/drawable-xxxhdpi/ic_timer_off_disabled.png new file mode 100644 index 000000000..2bee3e7c2 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_off_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_off_indicator.png b/res/drawable-xxxhdpi/ic_timer_off_indicator.png new file mode 100644 index 000000000..201a4ddfb Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_off_indicator.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_off_normal.png b/res/drawable-xxxhdpi/ic_timer_off_normal.png new file mode 100644 index 000000000..4d1dbc016 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_off_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_trash_disabled.png b/res/drawable-xxxhdpi/ic_trash_disabled.png new file mode 100644 index 000000000..a527acc08 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_trash_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_trash_normal.png b/res/drawable-xxxhdpi/ic_trash_normal.png new file mode 100644 index 000000000..6933c26b7 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_trash_normal.png differ diff --git a/res/drawable-xxxhdpi/ic_video_blanket.png b/res/drawable-xxxhdpi/ic_video_blanket.png new file mode 100644 index 000000000..23caf41ba Binary files /dev/null and b/res/drawable-xxxhdpi/ic_video_blanket.png differ diff --git a/res/drawable-xxxhdpi/ic_video_disabled.png b/res/drawable-xxxhdpi/ic_video_disabled.png new file mode 100644 index 000000000..1e49bc942 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_video_disabled.png differ diff --git a/res/drawable-xxxhdpi/ic_video_normal.png b/res/drawable-xxxhdpi/ic_video_normal.png new file mode 100644 index 000000000..27125591a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_video_normal.png differ diff --git a/res/drawable/ic_camera.xml b/res/drawable/ic_camera.xml new file mode 100644 index 000000000..b34733384 --- /dev/null +++ b/res/drawable/ic_camera.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_capture_camera.xml b/res/drawable/ic_capture_camera.xml new file mode 100644 index 000000000..9433dbce6 --- /dev/null +++ b/res/drawable/ic_capture_camera.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_capture_panorama.xml b/res/drawable/ic_capture_panorama.xml new file mode 100644 index 000000000..c62f231ae --- /dev/null +++ b/res/drawable/ic_capture_panorama.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_capture_refocus.xml b/res/drawable/ic_capture_refocus.xml new file mode 100644 index 000000000..33c43078f --- /dev/null +++ b/res/drawable/ic_capture_refocus.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_capture_video.xml b/res/drawable/ic_capture_video.xml new file mode 100644 index 000000000..d3600c842 --- /dev/null +++ b/res/drawable/ic_capture_video.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_refocus.xml b/res/drawable/ic_refocus.xml new file mode 100644 index 000000000..9ef5003f8 --- /dev/null +++ b/res/drawable/ic_refocus.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/res/layout-land/location_dialog_content.xml b/res/layout-land/location_dialog_content.xml index 16acd421f..837a99ca0 100644 --- a/res/layout-land/location_dialog_content.xml +++ b/res/layout-land/location_dialog_content.xml @@ -27,12 +27,12 @@ android:layout_marginLeft="16dp" android:layout_weight="1"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/remember_location_title" + android:textSize="22sp" + android:textColor="@color/dialog_text_color" + android:layout_marginBottom="28dp" /> @drawable/ic_camera_blanket @drawable/ic_video_blanket @drawable/ic_refocus_blanket - @drawable/ic_photo_sphere_blanket + @drawable/ic_photosphere_blanket @drawable/ic_pano_blanket @drawable/ic_camera_blanket @drawable/ic_camera_blanket @@ -481,18 +481,18 @@ @drawable/ic_camera_normal @drawable/ic_video_normal @drawable/ic_refocus_normal - @drawable/ic_photo_sphere_normal + @drawable/ic_photosphere_normal @drawable/ic_panorama_normal @drawable/ic_camera_normal - @drawable/ic_camera - @drawable/ic_video - @drawable/ic_refocus + @drawable/ic_capture_camera + @drawable/ic_capture_video + @drawable/ic_capture_refocus @null - @drawable/ic_panorama - @drawable/ic_camera + @drawable/ic_capture_panorama + @drawable/ic_capture_camera diff --git a/res/values/colors.xml b/res/values/colors.xml index a70d44357..4c3069508 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -99,9 +99,9 @@ #33FFFFFF #4CFFFFFF - #F5F5F5 + #FFFDD835 #FF76A7F9 - #6D6D6D + #DF000000 #2962FF diff --git a/res_p/drawable-hdpi/ic_camera_blanket.png b/res_p/drawable-hdpi/ic_camera_blanket.png deleted file mode 100644 index 29d955678..000000000 Binary files a/res_p/drawable-hdpi/ic_camera_blanket.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_camera_normal.png b/res_p/drawable-hdpi/ic_camera_normal.png deleted file mode 100644 index ecafe13e1..000000000 Binary files a/res_p/drawable-hdpi/ic_camera_normal.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_panorama_disabled.png b/res_p/drawable-hdpi/ic_panorama_disabled.png new file mode 100644 index 000000000..59e6048df Binary files /dev/null and b/res_p/drawable-hdpi/ic_panorama_disabled.png differ diff --git a/res_p/drawable-hdpi/ic_photo_sphere_blanket.png b/res_p/drawable-hdpi/ic_photo_sphere_blanket.png deleted file mode 100644 index c667cc654..000000000 Binary files a/res_p/drawable-hdpi/ic_photo_sphere_blanket.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_photo_sphere_normal.png b/res_p/drawable-hdpi/ic_photo_sphere_normal.png deleted file mode 100644 index 64cff4233..000000000 Binary files a/res_p/drawable-hdpi/ic_photo_sphere_normal.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_photosphere_blanket.png b/res_p/drawable-hdpi/ic_photosphere_blanket.png new file mode 100644 index 000000000..c667cc654 Binary files /dev/null and b/res_p/drawable-hdpi/ic_photosphere_blanket.png differ diff --git a/res_p/drawable-hdpi/ic_photosphere_disabled.png b/res_p/drawable-hdpi/ic_photosphere_disabled.png new file mode 100644 index 000000000..64cff4233 Binary files /dev/null and b/res_p/drawable-hdpi/ic_photosphere_disabled.png differ diff --git a/res_p/drawable-hdpi/ic_photosphere_normal.png b/res_p/drawable-hdpi/ic_photosphere_normal.png new file mode 100644 index 000000000..64cff4233 Binary files /dev/null and b/res_p/drawable-hdpi/ic_photosphere_normal.png differ diff --git a/res_p/drawable-hdpi/ic_refocus_disabled.png b/res_p/drawable-hdpi/ic_refocus_disabled.png new file mode 100644 index 000000000..59268add2 Binary files /dev/null and b/res_p/drawable-hdpi/ic_refocus_disabled.png differ diff --git a/res_p/drawable-hdpi/ic_video_blanket.png b/res_p/drawable-hdpi/ic_video_blanket.png deleted file mode 100644 index 7c6ad3e3d..000000000 Binary files a/res_p/drawable-hdpi/ic_video_blanket.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_video_disabled.png b/res_p/drawable-hdpi/ic_video_disabled.png deleted file mode 100644 index 093fb8c6e..000000000 Binary files a/res_p/drawable-hdpi/ic_video_disabled.png and /dev/null differ diff --git a/res_p/drawable-hdpi/ic_video_normal.png b/res_p/drawable-hdpi/ic_video_normal.png deleted file mode 100644 index 90d9adf66..000000000 Binary files a/res_p/drawable-hdpi/ic_video_normal.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_camera_blanket.png b/res_p/drawable-mdpi/ic_camera_blanket.png deleted file mode 100644 index bcf041faf..000000000 Binary files a/res_p/drawable-mdpi/ic_camera_blanket.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_camera_normal.png b/res_p/drawable-mdpi/ic_camera_normal.png deleted file mode 100644 index c6034c97c..000000000 Binary files a/res_p/drawable-mdpi/ic_camera_normal.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_panorama_disabled.png b/res_p/drawable-mdpi/ic_panorama_disabled.png new file mode 100644 index 000000000..ea318a331 Binary files /dev/null and b/res_p/drawable-mdpi/ic_panorama_disabled.png differ diff --git a/res_p/drawable-mdpi/ic_photo_sphere_blanket.png b/res_p/drawable-mdpi/ic_photo_sphere_blanket.png deleted file mode 100644 index 1db0e499e..000000000 Binary files a/res_p/drawable-mdpi/ic_photo_sphere_blanket.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_photo_sphere_normal.png b/res_p/drawable-mdpi/ic_photo_sphere_normal.png deleted file mode 100644 index 9278222d9..000000000 Binary files a/res_p/drawable-mdpi/ic_photo_sphere_normal.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_photosphere_blanket.png b/res_p/drawable-mdpi/ic_photosphere_blanket.png new file mode 100644 index 000000000..1db0e499e Binary files /dev/null and b/res_p/drawable-mdpi/ic_photosphere_blanket.png differ diff --git a/res_p/drawable-mdpi/ic_photosphere_disabled.png b/res_p/drawable-mdpi/ic_photosphere_disabled.png new file mode 100644 index 000000000..9278222d9 Binary files /dev/null and b/res_p/drawable-mdpi/ic_photosphere_disabled.png differ diff --git a/res_p/drawable-mdpi/ic_photosphere_normal.png b/res_p/drawable-mdpi/ic_photosphere_normal.png new file mode 100644 index 000000000..9278222d9 Binary files /dev/null and b/res_p/drawable-mdpi/ic_photosphere_normal.png differ diff --git a/res_p/drawable-mdpi/ic_refocus_disabled.png b/res_p/drawable-mdpi/ic_refocus_disabled.png new file mode 100644 index 000000000..11feacfa8 Binary files /dev/null and b/res_p/drawable-mdpi/ic_refocus_disabled.png differ diff --git a/res_p/drawable-mdpi/ic_video_blanket.png b/res_p/drawable-mdpi/ic_video_blanket.png deleted file mode 100644 index 0b331b718..000000000 Binary files a/res_p/drawable-mdpi/ic_video_blanket.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_video_disabled.png b/res_p/drawable-mdpi/ic_video_disabled.png deleted file mode 100644 index 5efcf0bfe..000000000 Binary files a/res_p/drawable-mdpi/ic_video_disabled.png and /dev/null differ diff --git a/res_p/drawable-mdpi/ic_video_normal.png b/res_p/drawable-mdpi/ic_video_normal.png deleted file mode 100644 index c8a2dd155..000000000 Binary files a/res_p/drawable-mdpi/ic_video_normal.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_camera_blanket.png b/res_p/drawable-xhdpi/ic_camera_blanket.png deleted file mode 100644 index 043d9d081..000000000 Binary files a/res_p/drawable-xhdpi/ic_camera_blanket.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_camera_normal.png b/res_p/drawable-xhdpi/ic_camera_normal.png deleted file mode 100644 index db7ad435c..000000000 Binary files a/res_p/drawable-xhdpi/ic_camera_normal.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_panorama_disabled.png b/res_p/drawable-xhdpi/ic_panorama_disabled.png new file mode 100644 index 000000000..f3a934032 Binary files /dev/null and b/res_p/drawable-xhdpi/ic_panorama_disabled.png differ diff --git a/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png b/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png deleted file mode 100644 index e7306d3c5..000000000 Binary files a/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_photo_sphere_normal.png b/res_p/drawable-xhdpi/ic_photo_sphere_normal.png deleted file mode 100644 index 63f78399e..000000000 Binary files a/res_p/drawable-xhdpi/ic_photo_sphere_normal.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_photosphere_blanket.png b/res_p/drawable-xhdpi/ic_photosphere_blanket.png new file mode 100644 index 000000000..e7306d3c5 Binary files /dev/null and b/res_p/drawable-xhdpi/ic_photosphere_blanket.png differ diff --git a/res_p/drawable-xhdpi/ic_photosphere_disabled.png b/res_p/drawable-xhdpi/ic_photosphere_disabled.png new file mode 100644 index 000000000..63f78399e Binary files /dev/null and b/res_p/drawable-xhdpi/ic_photosphere_disabled.png differ diff --git a/res_p/drawable-xhdpi/ic_photosphere_normal.png b/res_p/drawable-xhdpi/ic_photosphere_normal.png new file mode 100644 index 000000000..63f78399e Binary files /dev/null and b/res_p/drawable-xhdpi/ic_photosphere_normal.png differ diff --git a/res_p/drawable-xhdpi/ic_refocus_disabled.png b/res_p/drawable-xhdpi/ic_refocus_disabled.png new file mode 100644 index 000000000..20410c484 Binary files /dev/null and b/res_p/drawable-xhdpi/ic_refocus_disabled.png differ diff --git a/res_p/drawable-xhdpi/ic_video_blanket.png b/res_p/drawable-xhdpi/ic_video_blanket.png deleted file mode 100644 index 28c313c4c..000000000 Binary files a/res_p/drawable-xhdpi/ic_video_blanket.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_video_disabled.png b/res_p/drawable-xhdpi/ic_video_disabled.png deleted file mode 100644 index 70fe0fc8c..000000000 Binary files a/res_p/drawable-xhdpi/ic_video_disabled.png and /dev/null differ diff --git a/res_p/drawable-xhdpi/ic_video_normal.png b/res_p/drawable-xhdpi/ic_video_normal.png deleted file mode 100644 index c6e561cfe..000000000 Binary files a/res_p/drawable-xhdpi/ic_video_normal.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_camera_blanket.png b/res_p/drawable-xxhdpi/ic_camera_blanket.png deleted file mode 100644 index 4b6d857ee..000000000 Binary files a/res_p/drawable-xxhdpi/ic_camera_blanket.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_camera_normal.png b/res_p/drawable-xxhdpi/ic_camera_normal.png deleted file mode 100644 index 125d3955d..000000000 Binary files a/res_p/drawable-xxhdpi/ic_camera_normal.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_panorama_disabled.png b/res_p/drawable-xxhdpi/ic_panorama_disabled.png new file mode 100644 index 000000000..09d7a7a7e Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_panorama_disabled.png differ diff --git a/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png b/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png deleted file mode 100644 index 54d0360a3..000000000 Binary files a/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_photo_sphere_normal.png b/res_p/drawable-xxhdpi/ic_photo_sphere_normal.png deleted file mode 100644 index 2c886415d..000000000 Binary files a/res_p/drawable-xxhdpi/ic_photo_sphere_normal.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_photosphere_blanket.png b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png new file mode 100644 index 000000000..54d0360a3 Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_photosphere_blanket.png differ diff --git a/res_p/drawable-xxhdpi/ic_photosphere_disabled.png b/res_p/drawable-xxhdpi/ic_photosphere_disabled.png new file mode 100644 index 000000000..2c886415d Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_photosphere_disabled.png differ diff --git a/res_p/drawable-xxhdpi/ic_photosphere_normal.png b/res_p/drawable-xxhdpi/ic_photosphere_normal.png new file mode 100644 index 000000000..2c886415d Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_photosphere_normal.png differ diff --git a/res_p/drawable-xxhdpi/ic_refocus_disabled.png b/res_p/drawable-xxhdpi/ic_refocus_disabled.png new file mode 100644 index 000000000..369c10a84 Binary files /dev/null and b/res_p/drawable-xxhdpi/ic_refocus_disabled.png differ diff --git a/res_p/drawable-xxhdpi/ic_video_blanket.png b/res_p/drawable-xxhdpi/ic_video_blanket.png deleted file mode 100644 index ce2badd72..000000000 Binary files a/res_p/drawable-xxhdpi/ic_video_blanket.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_video_disabled.png b/res_p/drawable-xxhdpi/ic_video_disabled.png deleted file mode 100644 index f1576324e..000000000 Binary files a/res_p/drawable-xxhdpi/ic_video_disabled.png and /dev/null differ diff --git a/res_p/drawable-xxhdpi/ic_video_normal.png b/res_p/drawable-xxhdpi/ic_video_normal.png deleted file mode 100644 index e9fd11b9a..000000000 Binary files a/res_p/drawable-xxhdpi/ic_video_normal.png and /dev/null differ diff --git a/res_p/drawable/ic_camera.xml b/res_p/drawable/ic_camera.xml deleted file mode 100644 index b34733384..000000000 --- a/res_p/drawable/ic_camera.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - diff --git a/res_p/drawable/ic_refocus.xml b/res_p/drawable/ic_refocus.xml deleted file mode 100644 index 9ef5003f8..000000000 --- a/res_p/drawable/ic_refocus.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - -- cgit v1.2.3 From 9cc7ef5128b18de6160c84fddf4da39f7e2356b3 Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Wed, 27 Aug 2014 11:25:45 -0700 Subject: fix for a doublebounce of the filmstip button on filmstip swipe out bug: 17301367 Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477 --- src/com/android/camera/widget/FilmstripLayout.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java index c943b7eb2..2e7819ad0 100644 --- a/src/com/android/camera/widget/FilmstripLayout.java +++ b/src/com/android/camera/widget/FilmstripLayout.java @@ -327,7 +327,6 @@ public class FilmstripLayout extends FrameLayout implements FilmstripContentPane mSwipeTrend = (((int) dx) >> 1) + (mSwipeTrend >> 1); if (dx < 0 && mFilmstripContentLayout.getTranslationX() == 0) { mBackgroundDrawable.setOffset(0); - FilmstripLayout.this.onSwipeOutBegin(); } // When we start translating the filmstrip in, we want the left edge of the -- cgit v1.2.3 From 7109b77159a9bc8d8e420fab0204acda939dc997 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 11 Sep 2014 10:25:54 -0700 Subject: Establish synchronous camera closing when app utilizes API1/API2 To ensure API1 and API2 portability implementations coordinate together, if app uses API2 for any mode, lock both modes into synchronouse camera closing. Bug: 17464089 Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a --- src/com/android/camera/app/CameraController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java index feb988204..c87df91d5 100644 --- a/src/com/android/camera/app/CameraController.java +++ b/src/com/android/camera/app/CameraController.java @@ -22,6 +22,7 @@ import android.os.Handler; import com.android.camera.CameraDisabledException; import com.android.camera.debug.Log; import com.android.camera.util.CameraUtil; +import com.android.camera.util.GservicesHelper; import com.android.ex.camera2.portability.CameraAgent; import com.android.ex.camera2.portability.CameraAgent.CameraExceptionCallback; import com.android.ex.camera2.portability.CameraDeviceInfo; @@ -230,12 +231,14 @@ public class CameraController implements CameraAgent.CameraOpenCallback, CameraP // No camera yet. checkAndOpenCamera(mContext, cameraManager, id, mCallbackHandler, this); } else if (mCameraProxy.getCameraId() != id || mUsingNewApi != useNewApi) { + boolean syncClose = GservicesHelper.useCamera2ApiThroughPortabilityLayer(mContext); Log.v(TAG, "different camera already opened, closing then reopening"); // Already has camera opened, and is switching cameras and/or APIs. if (mUsingNewApi) { - mCameraAgentNg.closeCamera(mCameraProxy, false); + mCameraAgentNg.closeCamera(mCameraProxy, true); } else { - mCameraAgent.closeCamera(mCameraProxy, false); + // if using API2 ensure API1 usage is also synced + mCameraAgent.closeCamera(mCameraProxy, syncClose); } checkAndOpenCamera(mContext, cameraManager, id, mCallbackHandler, this); } else { -- cgit v1.2.3 From cc606712deb946dc978cac3fef16851894c06e29 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 11 Sep 2014 16:29:20 -0700 Subject: Revert layout change for Camera Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of Action Bar. Bug: 17477202 Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde --- src/com/android/camera/CameraActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 8fbe5bd4a..9a560fce3 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -248,7 +248,7 @@ public class CameraActivity extends Activity private static final int LIGHTS_OUT_DELAY_MS = 4000; private final int BASE_SYS_UI_VISIBILITY = - View.SYSTEM_UI_FLAG_FULLSCREEN + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE; private final Runnable mLightsOutRunnable = new Runnable() { @Override -- cgit v1.2.3 From d74c99e0936fe71cd657a9ce114bb5d1e5b3fcae Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Mon, 8 Sep 2014 10:43:04 -0700 Subject: mode switch jank fixes puts many ValueAnimators news into initialize methods changes startPreview() calls to startPreviewWithCallback() puts MultToggleImageButton's bitmap combine into an AsyncTask bug: 17070332 Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c --- src/com/android/camera/MultiToggleImageButton.java | 112 +++++----- src/com/android/camera/PhotoModule.java | 21 +- src/com/android/camera/VideoModule.java | 10 +- src/com/android/camera/app/CameraAppUI.java | 21 +- src/com/android/camera/ui/ModeIconView.java | 28 +-- src/com/android/camera/ui/ModeListView.java | 235 ++++++++++++--------- src/com/android/camera/ui/ModeSelectorItem.java | 16 -- 7 files changed, 217 insertions(+), 226 deletions(-) diff --git a/src/com/android/camera/MultiToggleImageButton.java b/src/com/android/camera/MultiToggleImageButton.java index b36cb3ca0..8e08a5615 100644 --- a/src/com/android/camera/MultiToggleImageButton.java +++ b/src/com/android/camera/MultiToggleImageButton.java @@ -18,6 +18,7 @@ package com.android.camera; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; +import android.animation.AnimatorSet; import android.animation.ValueAnimator; import android.content.Context; import android.content.res.TypedArray; @@ -25,6 +26,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.drawable.Drawable; +import android.os.AsyncTask; import android.util.AttributeSet; import android.view.View; import android.widget.ImageButton; @@ -58,7 +60,7 @@ public class MultiToggleImageButton extends ImageButton { public static final int ANIM_DIRECTION_VERTICAL = 0; public static final int ANIM_DIRECTION_HORIZONTAL = 1; - private static final int AINM_DURATION_MS = 250; + private static final int ANIM_DURATION_MS = 250; private static final int UNSET = -1; private OnStateChangeListener mOnStateChangeListener; @@ -69,6 +71,8 @@ public class MultiToggleImageButton extends ImageButton { private boolean mClickEnabled = true; private int mParentSize; private int mAnimDirection; + private Matrix mMatrix = new Matrix(); + private ValueAnimator mAnimator; public MultiToggleImageButton(Context context) { super(context); @@ -123,8 +127,7 @@ public class MultiToggleImageButton extends ImageButton { * @param callListener should the state change listener be called? */ public void setState(final int state, final boolean callListener) { - // TODO: animate button transitions, b/17414652 - setStateInternal(state, callListener); + setStateAnimatedInternal(state, callListener); } /** @@ -143,60 +146,47 @@ public class MultiToggleImageButton extends ImageButton { return; } - Bitmap bitmap = combine(mState, state); - if (bitmap == null) { - setStateInternal(state, callListener); - return; - } - - setImageBitmap(bitmap); - final Matrix matrix = new Matrix(); - - int offset; - if (mAnimDirection == ANIM_DIRECTION_VERTICAL) { - offset = (mParentSize+getHeight())/2; - } else if (mAnimDirection == ANIM_DIRECTION_HORIZONTAL) { - offset = (mParentSize+getWidth())/2; - } else { - return; - } - - ValueAnimator animator = ValueAnimator.ofFloat(-offset, 0.0f); - animator.setDuration(AINM_DURATION_MS); - animator.setInterpolator(Gusterpolator.INSTANCE); - animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - matrix.reset(); - if (mAnimDirection == ANIM_DIRECTION_VERTICAL) { - matrix.setTranslate(0.0f, (Float) animation.getAnimatedValue()); - } else if (mAnimDirection == ANIM_DIRECTION_HORIZONTAL) { - matrix.setTranslate((Float) animation.getAnimatedValue(), 0.0f); - } - - setImageMatrix(matrix); - invalidate(); - } - }); - animator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - setClickEnabled(false); - } - + new AsyncTask() { @Override - public void onAnimationEnd(Animator animation) { - setStateInternal(state, callListener); - setClickEnabled(true); + protected Bitmap doInBackground(Integer... params) { + return combine(params[0], params[1]); } @Override - public void onAnimationCancel(Animator animation) { - setStateInternal(state, callListener); - setClickEnabled(true); + protected void onPostExecute(Bitmap bitmap) { + if (bitmap == null) { + setStateInternal(state, callListener); + } else { + setImageBitmap(bitmap); + + int offset; + if (mAnimDirection == ANIM_DIRECTION_VERTICAL) { + offset = (mParentSize+getHeight())/2; + } else if (mAnimDirection == ANIM_DIRECTION_HORIZONTAL) { + offset = (mParentSize+getWidth())/2; + } else { + return; + } + + mAnimator.setFloatValues(-offset, 0.0f); + AnimatorSet s = new AnimatorSet(); + s.play(mAnimator); + s.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + setClickEnabled(false); + } + + @Override + public void onAnimationEnd(Animator animation) { + setStateInternal(state, callListener); + setClickEnabled(true); + } + }); + s.start(); + } } - }); - animator.start(); + }.execute(mState, state); } /** @@ -251,6 +241,24 @@ public class MultiToggleImageButton extends ImageButton { } }); setScaleType(ImageView.ScaleType.MATRIX); + + mAnimator = ValueAnimator.ofFloat(0.0f, 0.0f); + mAnimator.setDuration(ANIM_DURATION_MS); + mAnimator.setInterpolator(Gusterpolator.INSTANCE); + mAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + mMatrix.reset(); + if (mAnimDirection == ANIM_DIRECTION_VERTICAL) { + mMatrix.setTranslate(0.0f, (Float) animation.getAnimatedValue()); + } else if (mAnimDirection == ANIM_DIRECTION_HORIZONTAL) { + mMatrix.setTranslate((Float) animation.getAnimatedValue(), 0.0f); + } + + setImageMatrix(mMatrix); + invalidate(); + } + }); } private void parseAttributes(Context context, AttributeSet attrs) { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 8865a80be..cbaa01b99 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -75,6 +75,7 @@ import com.android.camera.util.SessionStatsCollector; import com.android.camera.util.UsageStatistics; import com.android.camera.widget.AspectRatioSelector; import com.android.camera2.R; +import com.android.ex.camera2.portability.CameraAgent; import com.android.ex.camera2.portability.CameraAgent.CameraAFCallback; import com.android.ex.camera2.portability.CameraAgent.CameraAFMoveCallback; import com.android.ex.camera2.portability.CameraAgent.CameraPictureCallback; @@ -1991,14 +1992,18 @@ public class PhotoModule mCameraDevice.setPreviewTexture(mActivity.getCameraAppUI().getSurfaceTexture()); Log.i(TAG, "startPreview"); - mCameraDevice.startPreview(); - - mFocusManager.onPreviewStarted(); - onPreviewStarted(); - SessionStatsCollector.instance().previewActive(true); - if (mSnapshotOnIdle) { - mHandler.post(mDoSnapRunnable); - } + mCameraDevice.startPreviewWithCallback(new Handler(Looper.getMainLooper()), + new CameraAgent.CameraStartPreviewCallback() { + @Override + public void onPreviewStarted() { + mFocusManager.onPreviewStarted(); + PhotoModule.this.onPreviewStarted(); + SessionStatsCollector.instance().previewActive(true); + if (mSnapshotOnIdle) { + mHandler.post(mDoSnapRunnable); + } + } + }); } finally { mStartPreviewLock = false; } diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index b71b30fd1..d4dcdad5d 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -37,6 +37,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.os.Message; import android.os.ParcelFileDescriptor; import android.os.SystemClock; @@ -917,9 +918,14 @@ public class VideoModule extends CameraModule } try { mCameraDevice.setPreviewTexture(surfaceTexture); - mCameraDevice.startPreview(); + mCameraDevice.startPreviewWithCallback(new Handler(Looper.getMainLooper()), + new CameraAgent.CameraStartPreviewCallback() { + @Override + public void onPreviewStarted() { + VideoModule.this.onPreviewStarted(); + } + }); mPreviewing = true; - onPreviewStarted(); } catch (Throwable ex) { closeCamera(); throw new RuntimeException("startPreview failed", ex); diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java index 30b654c59..04d61051d 100644 --- a/src/com/android/camera/app/CameraAppUI.java +++ b/src/com/android/camera/app/CameraAppUI.java @@ -945,7 +945,6 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, mController.getQuickSwitchToModuleId(currentModuleIndex); if (currentModuleIndex != moduleToTransitionTo) { mAppRootView.redirectTouchEventsTo(mModeTransitionView); - int shadeColorId = R.color.mode_cover_default_color; int iconRes = CameraUtil.getCameraModeCoverIconResId(moduleToTransitionTo, mController.getAndroidContext()); @@ -966,11 +965,6 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, } } }; - if (mSwipeState == SWIPE_UP) { - mModeTransitionView.prepareToPullUpShade(shadeColorId, iconRes, listener); - } else { - mModeTransitionView.prepareToPullDownShade(shadeColorId, iconRes, listener); - } } } else if (swipeState == SWIPE_LEFT) { // Pass the touch sequence to filmstrip layout. @@ -1355,7 +1349,6 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, Log.v(TAG, "onNewPreviewFrame"); CameraPerformanceTracker.onEvent(CameraPerformanceTracker.FIRST_PREVIEW_FRAME); hideModeCover(); - mModeCoverState = COVER_HIDDEN; } /** @@ -1429,13 +1422,6 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, } private void updateModeSpecificUIColors() { - // set up UI colors to match the current mode - /* - int colorId = CameraUtil.getCameraThemeColorId(mController.getCurrentModuleIndex(), - mController.getAndroidContext()); - int pressedColor = mController.getAndroidContext().getResources().getColor(colorId); - setBottomBarPressedColor(pressedColor); - */ setBottomBarColorsForModeIndex(mController.getCurrentModuleIndex()); } @@ -1582,14 +1568,13 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, @Override public void onSurfaceTextureUpdated(SurfaceTexture surface) { mSurface = surface; + if (mPreviewStatusListener != null) { + mPreviewStatusListener.onSurfaceTextureUpdated(surface); + } if (mModeCoverState == COVER_WILL_HIDE_AT_NEXT_TEXTURE_UPDATE) { Log.v(TAG, "hiding cover via onSurfaceTextureUpdated"); CameraPerformanceTracker.onEvent(CameraPerformanceTracker.FIRST_PREVIEW_FRAME); hideModeCover(); - mModeCoverState = COVER_HIDDEN; - } - if (mPreviewStatusListener != null) { - mPreviewStatusListener.onSurfaceTextureUpdated(surface); } } diff --git a/src/com/android/camera/ui/ModeIconView.java b/src/com/android/camera/ui/ModeIconView.java index e7e2701c6..a978bc75d 100644 --- a/src/com/android/camera/ui/ModeIconView.java +++ b/src/com/android/camera/ui/ModeIconView.java @@ -34,16 +34,13 @@ import com.android.camera2.R; * whereas a state list drawable would require a different drawable for each state. */ public class ModeIconView extends View { - private boolean mHighlightIsOn = false; private final GradientDrawable mBackground; - private final GradientDrawable mHoverDrawable; private final int mIconBackgroundSize; private int mHighlightColor; private final int mBackgroundDefaultColor; private final int mIconDrawableSize; private Drawable mIconDrawable = null; - private boolean mSelected = false; public ModeIconView(Context context, AttributeSet attrs) { super(context, attrs); @@ -53,13 +50,8 @@ public class ModeIconView extends View { mBackground = (GradientDrawable) getResources() .getDrawable(R.drawable.mode_icon_background).mutate(); mBackground.setBounds(0, 0, mIconBackgroundSize, mIconBackgroundSize); - mHoverDrawable = (GradientDrawable) getResources() - .getDrawable(R.drawable.mode_icon_background).mutate(); - mHoverDrawable.setBounds(0, 0, mIconBackgroundSize, mIconBackgroundSize); mIconDrawableSize = getResources().getDimensionPixelSize( R.dimen.mode_selector_icon_drawable_size); - - mHoverDrawable.setColor(getResources().getColor(R.color.mode_icon_hover_highlight)); } /** @@ -83,11 +75,7 @@ public class ModeIconView extends View { @Override public void draw(Canvas canvas) { super.draw(canvas); - if (mHighlightIsOn && !mSelected) { - mHoverDrawable.draw(canvas); - } else { - mBackground.draw(canvas); - } + mBackground.draw(canvas); if (mIconDrawable != null) { mIconDrawable.draw(canvas); } @@ -117,24 +105,10 @@ public class ModeIconView extends View { public void setSelected(boolean selected) { if (selected) { mBackground.setColor(mHighlightColor); - mHighlightIsOn = false; } else { mBackground.setColor(mBackgroundDefaultColor); } - mSelected = selected; - invalidate(); - } - - /** - * This gets called when the highlighted state is changed. When highlighted, - * a ring shaped drawable of a solid pre-defined color will be drawn on top - * of the background drawable to indicate highlight state. - * - * @param highlighted true when highlighted, false otherwise. - */ - public void setHighlighted(boolean highlighted) { - mHighlightIsOn = highlighted; invalidate(); } diff --git a/src/com/android/camera/ui/ModeListView.java b/src/com/android/camera/ui/ModeListView.java index 78ab9863c..41bd3d672 100644 --- a/src/com/android/camera/ui/ModeListView.java +++ b/src/com/android/camera/ui/ModeListView.java @@ -826,12 +826,11 @@ public class ModeListView extends FrameLayout * be revealed through a pinhole animation. After all the animations finish, * mode list will transition into fully hidden state. */ - private class SelectedState extends ModeListState { + private class SelectedState extends ModeListState { public SelectedState(ModeSelectorItem selectedItem) { final int modeId = selectedItem.getModeId(); // Un-highlight all the modes. for (int i = 0; i < mModeSelectorItems.length; i++) { - mModeSelectorItems[i].setHighlighted(false); mModeSelectorItems[i].setSelected(false); } @@ -1501,7 +1500,6 @@ public class ModeListView extends FrameLayout if (mModeSelectorItems != null) { // When becoming invisible/gone after initializing mode selector items. for (int i = 0; i < mModeSelectorItems.length; i++) { - mModeSelectorItems[i].setHighlighted(false); mModeSelectorItems[i].setSelected(false); } } @@ -1906,6 +1904,8 @@ public class ModeListView extends FrameLayout private int mPeepHoleCenterY = UNSET; private float mRadius = 0f; private ValueAnimator mPeepHoleAnimator; + private ValueAnimator mFadeOutAlphaAnimator; + private ValueAnimator mRevealAlphaAnimator; private Bitmap mBackground; private Bitmap mBackgroundOverlay; @@ -1923,6 +1923,107 @@ public class ModeListView extends FrameLayout mCoverPaint.setColor(0); mCoverPaint.setAlpha(0); + + setupAnimators(); + } + + private void setupAnimators() { + mFadeOutAlphaAnimator = ValueAnimator.ofInt(0, 255); + mFadeOutAlphaAnimator.setDuration(100); + mFadeOutAlphaAnimator.setInterpolator(Gusterpolator.INSTANCE); + mFadeOutAlphaAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + mCoverPaint.setAlpha((Integer) animation.getAnimatedValue()); + invalidate(); + } + }); + mFadeOutAlphaAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + // Sets a HW layer on the view for the animation. + setLayerType(LAYER_TYPE_HARDWARE, null); + } + + @Override + public void onAnimationEnd(Animator animation) { + // Sets the layer type back to NONE as a workaround for b/12594617. + setLayerType(LAYER_TYPE_NONE, null); + } + }); + + ///////////////// + + mRevealAlphaAnimator = ValueAnimator.ofInt(255, 0); + mRevealAlphaAnimator.setDuration(PEEP_HOLE_ANIMATION_DURATION_MS); + mRevealAlphaAnimator.setInterpolator(Gusterpolator.INSTANCE); + mRevealAlphaAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + int alpha = (Integer) animation.getAnimatedValue(); + mCirclePaint.setAlpha(alpha); + mCoverPaint.setAlpha(alpha); + } + }); + mRevealAlphaAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + // Sets a HW layer on the view for the animation. + setLayerType(LAYER_TYPE_HARDWARE, null); + } + + @Override + public void onAnimationEnd(Animator animation) { + // Sets the layer type back to NONE as a workaround for b/12594617. + setLayerType(LAYER_TYPE_NONE, null); + } + }); + + //////////////// + + int horizontalDistanceToFarEdge = Math.max(mPeepHoleCenterX, mWidth - mPeepHoleCenterX); + int verticalDistanceToFarEdge = Math.max(mPeepHoleCenterY, mHeight - mPeepHoleCenterY); + int endRadius = (int) (Math.sqrt(horizontalDistanceToFarEdge * horizontalDistanceToFarEdge + + verticalDistanceToFarEdge * verticalDistanceToFarEdge)); + int startRadius = getResources().getDimensionPixelSize( + R.dimen.mode_selector_icon_block_width) / 2; + + mPeepHoleAnimator = ValueAnimator.ofFloat(startRadius, endRadius); + mPeepHoleAnimator.setDuration(PEEP_HOLE_ANIMATION_DURATION_MS); + mPeepHoleAnimator.setInterpolator(Gusterpolator.INSTANCE); + mPeepHoleAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + // Modify mask by enlarging the hole + mRadius = (Float) mPeepHoleAnimator.getAnimatedValue(); + invalidate(); + } + }); + mPeepHoleAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + // Sets a HW layer on the view for the animation. + setLayerType(LAYER_TYPE_HARDWARE, null); + } + + @Override + public void onAnimationEnd(Animator animation) { + // Sets the layer type back to NONE as a workaround for b/12594617. + setLayerType(LAYER_TYPE_NONE, null); + } + }); + + //////////////// + int size = getContext().getResources() + .getDimensionPixelSize(R.dimen.mode_selector_icon_block_width); + mCircleDrawable = new TouchCircleDrawable(getContext().getResources()); + mCircleDrawable.setSize(size, size); + mCircleDrawable.setUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + invalidate(); + } + }); } @Override @@ -1936,6 +2037,16 @@ public class ModeListView extends FrameLayout return true; } + @Override + public void drawForeground(Canvas canvas) { + // Draw the circle in clear mode + if (mPeepHoleAnimator != null) { + // Draw a transparent circle using clear mode + canvas.drawCircle(mPeepHoleCenterX, mPeepHoleCenterY, mRadius, mMaskPaint); + canvas.drawCircle(mPeepHoleCenterX, mPeepHoleCenterY, mRadius, mCirclePaint); + } + } + public void setAnimationStartingPosition(int x, int y) { mPeepHoleCenterX = x; mPeepHoleCenterY = y; @@ -1977,16 +2088,6 @@ public class ModeListView extends FrameLayout } } - @Override - public void drawForeground(Canvas canvas) { - // Draw the circle in clear mode - if (mPeepHoleAnimator != null) { - // Draw a transparent circle using clear mode - canvas.drawCircle(mPeepHoleCenterX, mPeepHoleCenterY, mRadius, mMaskPaint); - canvas.drawCircle(mPeepHoleCenterX, mPeepHoleCenterY, mRadius, mCirclePaint); - } - } - @Override public boolean shouldDrawSuper() { // No need to draw super when mBackgroundOverlay is being drawn, as @@ -2000,36 +2101,11 @@ public class ModeListView extends FrameLayout mCoverPaint.setColor(0); mCoverPaint.setAlpha(0); - ValueAnimator alphaAnimator = ValueAnimator.ofInt(0, 255); - alphaAnimator.setDuration(100); - alphaAnimator.setInterpolator(Gusterpolator.INSTANCE); - alphaAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - mCoverPaint.setAlpha((Integer) animation.getAnimatedValue()); - invalidate(); - } - }); - if (listener != null) { - alphaAnimator.addListener(listener); - } - - int size = getContext().getResources() - .getDimensionPixelSize(R.dimen.mode_selector_icon_block_width); - mCircleDrawable = new TouchCircleDrawable(getContext().getResources()); mCircleDrawable.setIconDrawable( selectedItem.getIcon().getIconDrawableClone(), selectedItem.getIcon().getIconDrawableSize()); - mCircleDrawable.setSize(size, size); mCircleDrawable.setCenter(new Point(x, y)); mCircleDrawable.setColor(selectedItem.getHighlightColor()); - mCircleDrawable.setUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - invalidate(); - } - }); - mCircleDrawable.setAnimatorListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -2046,8 +2122,16 @@ public class ModeListView extends FrameLayout }); } }); + + // add fade out animator to a set, so we can freely add + // the listener without having to worry about listener dupes + AnimatorSet s = new AnimatorSet(); + s.play(mFadeOutAlphaAnimator); + if (listener != null) { + s.addListener(listener); + } mCircleDrawable.animate(); - alphaAnimator.start(); + s.start(); } @Override @@ -2060,73 +2144,18 @@ public class ModeListView extends FrameLayout mPeepHoleCenterY = mHeight / 2; } - int horizontalDistanceToFarEdge = Math.max(mPeepHoleCenterX, mWidth - mPeepHoleCenterX); - int verticalDistanceToFarEdge = Math.max(mPeepHoleCenterY, mHeight - mPeepHoleCenterY); - int endRadius = (int) (Math.sqrt(horizontalDistanceToFarEdge * horizontalDistanceToFarEdge - + verticalDistanceToFarEdge * verticalDistanceToFarEdge)); - int startRadius = getResources().getDimensionPixelSize( - R.dimen.mode_selector_icon_block_width) / 2; - - mPeepHoleAnimator = ValueAnimator.ofFloat(startRadius, endRadius); - mPeepHoleAnimator.setDuration(PEEP_HOLE_ANIMATION_DURATION_MS); - mPeepHoleAnimator.setInterpolator(Gusterpolator.INSTANCE); - mPeepHoleAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - // Modify mask by enlarging the hole - mRadius = (Float) mPeepHoleAnimator.getAnimatedValue(); - invalidate(); - } - }); - - if (listener != null) { - mPeepHoleAnimator.addListener(listener); - } - - mPeepHoleAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - // Sets a HW layer on the view for the animation. - setLayerType(LAYER_TYPE_HARDWARE, null); - } - - @Override - public void onAnimationEnd(Animator animation) { - // Sets the layer type back to NONE as a workaround for b/12594617. - setLayerType(LAYER_TYPE_NONE, null); - } - }); - mCirclePaint.setAlpha(255); mCoverPaint.setAlpha(255); - ValueAnimator alphaAnimator = ValueAnimator.ofInt(255, 0); - alphaAnimator.setDuration(PEEP_HOLE_ANIMATION_DURATION_MS); - alphaAnimator.setInterpolator(Gusterpolator.INSTANCE); - alphaAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - int alpha = (Integer) animation.getAnimatedValue(); - mCirclePaint.setAlpha(alpha); - mCoverPaint.setAlpha(alpha); - } - }); - alphaAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - // Sets a HW layer on the view for the animation. - setLayerType(LAYER_TYPE_HARDWARE, null); - } - @Override - public void onAnimationEnd(Animator animation) { - // Sets the layer type back to NONE as a workaround for b/12594617. - setLayerType(LAYER_TYPE_NONE, null); - } - }); - - - mPeepHoleAnimator.start(); - alphaAnimator.start(); + // add peephole and reveal animators to a set, so we can + // freely add the listener without having to worry about + // listener dupes + AnimatorSet s = new AnimatorSet(); + s.play(mPeepHoleAnimator).with(mRevealAlphaAnimator); + if (listener != null) { + s.addListener(listener); + } + s.start(); } @Override diff --git a/src/com/android/camera/ui/ModeSelectorItem.java b/src/com/android/camera/ui/ModeSelectorItem.java index 8b535b4c5..6ce70fcc5 100644 --- a/src/com/android/camera/ui/ModeSelectorItem.java +++ b/src/com/android/camera/ui/ModeSelectorItem.java @@ -42,11 +42,6 @@ import com.android.camera2.R; * we display the view partially. */ class ModeSelectorItem extends FrameLayout { - // Drawing modes that defines how the TextView should be drawn when there - // is not enough space to draw the whole TextView. - public static final int FLY_IN = 1; - public static final int FLY_OUT = 2; - private TextView mText; private ModeIconView mIcon; private int mVisibleWidth = 0; @@ -99,10 +94,6 @@ class ModeSelectorItem extends FrameLayout { mListener = listener; } - public void setHighlighted(boolean highlighted) { - mIcon.setHighlighted(highlighted); - } - @Override public void setSelected(boolean selected) { mIcon.setSelected(selected); @@ -121,13 +112,6 @@ class ModeSelectorItem extends FrameLayout { return false; } - @Override - public void setPressed(boolean pressed) { - super.setPressed(pressed); - // When pressed state changes, highlight the icon. - mIcon.setHighlighted(pressed); - } - /** * When swiping in, we truncate the end of the item if the visible width * is not enough to show the whole item. When swiping out, we truncate the -- cgit v1.2.3 From bdba0dc07cc6a0a0ba08aeb5903b7b00b6cfc1ef Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Thu, 18 Sep 2014 19:44:07 -0700 Subject: portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround. bug: 17576554 Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9 --- src/com/android/camera/PhotoModule.java | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index cbaa01b99..ffa5601c8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1992,18 +1992,27 @@ public class PhotoModule mCameraDevice.setPreviewTexture(mActivity.getCameraAppUI().getSurfaceTexture()); Log.i(TAG, "startPreview"); - mCameraDevice.startPreviewWithCallback(new Handler(Looper.getMainLooper()), - new CameraAgent.CameraStartPreviewCallback() { - @Override - public void onPreviewStarted() { - mFocusManager.onPreviewStarted(); - PhotoModule.this.onPreviewStarted(); - SessionStatsCollector.instance().previewActive(true); - if (mSnapshotOnIdle) { - mHandler.post(mDoSnapRunnable); + // If we're using API2 in portability layers, don't use startPreviewWithCallback() + // b/17576554 + CameraAgent.CameraStartPreviewCallback startPreviewCallback = + new CameraAgent.CameraStartPreviewCallback() { + @Override + public void onPreviewStarted() { + mFocusManager.onPreviewStarted(); + PhotoModule.this.onPreviewStarted(); + SessionStatsCollector.instance().previewActive(true); + if (mSnapshotOnIdle) { + mHandler.post(mDoSnapRunnable); + } } - } - }); + }; + if (GservicesHelper.useCamera2ApiThroughPortabilityLayer(mActivity)) { + mCameraDevice.startPreview(); + startPreviewCallback.onPreviewStarted(); + } else { + mCameraDevice.startPreviewWithCallback(new Handler(Looper.getMainLooper()), + startPreviewCallback); + } } finally { mStartPreviewLock = false; } -- cgit v1.2.3 From a0697c5b879f48ad009192028b34578eae42f394 Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Fri, 19 Sep 2014 11:18:46 -0700 Subject: add null check to updateCameraParametersPreferences to apease the monkey bug: 17580046 Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0 --- src/com/android/camera/PhotoModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ffa5601c8..ab6afdb2a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2110,6 +2110,12 @@ public class PhotoModule } private void updateCameraParametersPreference() { + // some monkey tests can get here when shutting the app down + // make sure mCameraDevice is still valid, b/17580046 + if (mCameraDevice == null) { + return; + } + setAutoExposureLockIfSupported(); setAutoWhiteBalanceLockIfSupported(); setFocusAreasIfSupported(); -- cgit v1.2.3 From 6e73222fde5242b424ad712b802f387244da0e53 Mon Sep 17 00:00:00 2001 From: Spike Sprague Date: Mon, 22 Sep 2014 10:52:32 -0700 Subject: monkey test NPE fix, another null check on mCameraDevice bug: 17604028 Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd --- src/com/android/camera/PhotoModule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ab6afdb2a..8f42014bd 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2321,7 +2321,11 @@ public class PhotoModule updateCameraParametersPreference(); } - mCameraDevice.applySettings(mCameraSettings); + // some monkey tests can get here when shutting the app down + // make sure mCameraDevice is still valid, b/17604028 + if (mCameraDevice != null) { + mCameraDevice.applySettings(mCameraSettings); + } } // If the Camera is idle, update the parameters immediately, otherwise -- cgit v1.2.3 From 891dc7f06a8ef67e266bbc37c9e3be32583fc2c7 Mon Sep 17 00:00:00 2001 From: Senpo Hu Date: Thu, 25 Sep 2014 10:53:12 -0700 Subject: Stability: add null check for all CameraProxy obj references in PhotoModule. Bug: 17643705 Bug: 17604028 Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc --- src/com/android/camera/PhotoModule.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 7afa9156e..43103080a 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -749,7 +749,9 @@ public class PhotoModule CameraCapabilities.SceneMode.AUTO)); } updateParametersSceneMode(); - mCameraDevice.applySettings(mCameraSettings); + if (mCameraDevice != null) { + mCameraDevice.applySettings(mCameraSettings); + } updateSceneMode(); } } @@ -906,7 +908,7 @@ public class PhotoModule @Override public void startFaceDetection() { - if (mFaceDetectionStarted) { + if (mFaceDetectionStarted || mCameraDevice == null) { return; } if (mCameraCapabilities.getMaxNumOfFacesSupported() > 0) { @@ -920,7 +922,7 @@ public class PhotoModule @Override public void stopFaceDetection() { - if (!mFaceDetectionStarted) { + if (!mFaceDetectionStarted || mCameraDevice == null) { return; } if (mCameraCapabilities.getMaxNumOfFacesSupported() > 0) { @@ -1970,7 +1972,7 @@ public class PhotoModule // eventually recurse back into startPreview(). // To avoid calling startPreview() twice, we must acquire // mStartPreviewLock. - if (mStartPreviewLock) { + if (mStartPreviewLock || mCameraDevice == null) { // do nothing return; } @@ -2155,6 +2157,10 @@ public class PhotoModule } private void updateParametersPictureSize() { + if (mCameraDevice == null) { + return; + } + SettingsManager settingsManager = mActivity.getSettingsManager(); String pictureSizeKey = isCameraFrontFacing() ? Keys.KEY_PICTURE_SIZE_FRONT : Keys.KEY_PICTURE_SIZE_BACK; @@ -2284,6 +2290,9 @@ public class PhotoModule @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private void updateAutoFocusMoveCallback() { + if (mCameraDevice == null) { + return; + } if (mCameraSettings.getCurrentFocusMode() == CameraCapabilities.FocusMode.CONTINUOUS_PICTURE) { mCameraDevice.setAutoFocusMoveCallback(mHandler, @@ -2327,8 +2336,6 @@ public class PhotoModule updateCameraParametersPreference(); } - // some monkey tests can get here when shutting the app down - // make sure mCameraDevice is still valid, b/17604028 if (mCameraDevice != null) { mCameraDevice.applySettings(mCameraSettings); } -- cgit v1.2.3 From 882402f8722407703a69b4a132ebd78f733cce2f Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 25 Sep 2014 11:21:01 -0700 Subject: Force filmstrip images to generate in JPEG compression format Due to https://github.com/bumptech/glide/issues/156, we sometimes were getting PNG cache image generation which greatly increased latency and introduced jank. As workaround, explicitly forcing images to utilize JPEG format. Bug: 17597861 Change-Id: I49d7266d4ff0173d253877612b3076489a6b385a --- src/com/android/camera/data/LocalMediaData.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 708bf53e9..cb5ba41ae 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -73,6 +73,10 @@ public abstract class LocalMediaData implements LocalData { protected final double mLongitude; protected final Bundle mMetaData; + private static final int JPEG_COMPRESS_QUALITY = 90; + private static final BitmapEncoder JPEG_ENCODER = + new BitmapEncoder(Bitmap.CompressFormat.JPEG, JPEG_COMPRESS_QUALITY); + /** * Used for thumbnail loading optimization. True if this data has a * corresponding visible view. @@ -354,9 +358,6 @@ public abstract class LocalMediaData implements LocalData { private static final int mSupportedDataActions = DATA_ACTION_DELETE | DATA_ACTION_EDIT | DATA_ACTION_SHARE; - private static final int JPEG_COMPRESS_QUALITY = 90; - private static final BitmapEncoder JPEG_ENCODER = new BitmapEncoder(null, JPEG_COMPRESS_QUALITY); - /** from MediaStore, can only be 0, 90, 180, 270 */ private final int mOrientation; /** @see #getSignature() */ @@ -802,8 +803,12 @@ public abstract class LocalMediaData implements LocalData { Glide.with(context) .loadFromMediaStore(getUri(), mMimeType, mDateModifiedInSeconds, 0) + .asBitmap() + .encoder(JPEG_ENCODER) .thumbnail(Glide.with(context) .loadFromMediaStore(getUri(), mMimeType, mDateModifiedInSeconds, 0) + .asBitmap() + .encoder(JPEG_ENCODER) .override(MEDIASTORE_THUMB_WIDTH, MEDIASTORE_THUMB_HEIGHT)) .placeholder(placeHolderResourceId) .fitCenter() -- cgit v1.2.3 From 1889dae3c8048e1ce901a5d78cd0adc9ed0c7057 Mon Sep 17 00:00:00 2001 From: Puneet Lall Date: Wed, 24 Sep 2014 21:30:53 -0700 Subject: Recreate a OneCameraManager instance for each Activity. Bug: 17484715 Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e --- src/com/android/camera/CameraActivity.java | 5 ++++- src/com/android/camera/one/OneCameraManager.java | 19 ++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a368b982e..571a692a4 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -194,6 +194,7 @@ public class CameraActivity extends Activity */ private LocalDataAdapter mDataAdapter; + private OneCameraManager mCameraManager; private SettingsManager mSettingsManager; private ModeListView mModeListView; private boolean mModeListVisible = false; @@ -1260,7 +1261,7 @@ public class CameraActivity extends Activity @Override public OneCameraManager getCameraManager() { - return OneCameraManager.get(this); + return mCameraManager; } private void removeData(int dataID) { @@ -1331,6 +1332,8 @@ public class CameraActivity extends Activity mAppContext = getApplicationContext(); mSoundPlayer = new SoundPlayer(mAppContext); + mCameraManager = OneCameraManager.get(this); + // TODO: Try to move all the resources allocation to happen as soon as // possible so we can call module.init() at the earliest time. mModuleManager = new ModuleManagerImpl(); diff --git a/src/com/android/camera/one/OneCameraManager.java b/src/com/android/camera/one/OneCameraManager.java index 13f7dfe0b..4c78f3576 100644 --- a/src/com/android/camera/one/OneCameraManager.java +++ b/src/com/android/camera/one/OneCameraManager.java @@ -20,6 +20,7 @@ import android.content.Context; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; +import android.os.Build; import android.util.DisplayMetrics; import android.view.WindowManager; @@ -58,22 +59,11 @@ public abstract class OneCameraManager { public abstract boolean hasCameraFacing(Facing facing); /** - * Singleton camera manager to be used throughout the app. - */ - private static OneCameraManager sCameraManager; - - /** - * Returns a camera manager that is based on Camera2 API, if available, or + * Creates a camera manager that is based on Camera2 API, if available, or * otherwise uses the portability layer API. - *

- * The instance is created the first time this method is called and cached - * in a singleton thereafter, so successive calls are cheap. */ public static OneCameraManager get(CameraActivity activity) { - if (sCameraManager == null) { - sCameraManager = create(activity); - } - return sCameraManager; + return create(activity); } /** @@ -105,6 +95,9 @@ public abstract class OneCameraManager { * HALs. */ private static boolean isCamera2Supported(CameraManager cameraManager) { + if (Build.VERSION.SDK_INT < 21) { + return false; + } try { final String id = cameraManager.getCameraIdList()[0]; // TODO: We should check for all the flags we need to ensure the -- cgit v1.2.3 From 59331b1a60b711581cb3ab81b1d99f216e7d41a7 Mon Sep 17 00:00:00 2001 From: Senpo Hu Date: Fri, 26 Sep 2014 11:05:08 -0700 Subject: Stability: add null check for all CameraProxy obj references in VideoModule. Bug: 17657161 Bug: 17653725 Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d --- src/com/android/camera/PhotoModule.java | 6 ++++ src/com/android/camera/VideoModule.java | 55 +++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 43103080a..3b85993ae 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1808,6 +1808,9 @@ public class PhotoModule @Override public void autoFocus() { + if (mCameraDevice == null) { + return; + } Log.v(TAG,"Starting auto focus"); mFocusStartTime = System.currentTimeMillis(); mCameraDevice.autoFocus(mHandler, mAutoFocusCallback); @@ -1817,6 +1820,9 @@ public class PhotoModule @Override public void cancelAutoFocus() { + if (mCameraDevice == null) { + return; + } mCameraDevice.cancelAutoFocus(); setCameraState(IDLE); setCameraParameters(UPDATE_PARAM_PREFERENCE); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index d4dcdad5d..99e0501a6 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -414,7 +414,7 @@ public class VideoModule extends CameraModule } if (!mIsVideoCaptureIntent) { if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress - || !mAppController.isShutterEnabled()) { + || !mAppController.isShutterEnabled() || mCameraDevice == null) { return; } @@ -432,7 +432,7 @@ public class VideoModule extends CameraModule @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private void updateAutoFocusMoveCallback() { - if (mPaused) { + if (mPaused || mCameraDevice == null) { return; } @@ -587,6 +587,10 @@ public class VideoModule extends CameraModule @Override public void onCameraAvailable(CameraProxy cameraProxy) { + if (cameraProxy == null) { + Log.w(TAG, "onCameraAvailable returns a null CameraProxy object"); + return; + } mCameraDevice = cameraProxy; mCameraCapabilities = mCameraDevice.getCapabilities(); mCameraSettings = mCameraDevice.getSettings(); @@ -946,7 +950,7 @@ public class VideoModule extends CameraModule @Override public void stopPreview() { - if (!mPreviewing) { + if (!mPreviewing || mCameraDevice == null) { return; } mCameraDevice.stopPreview(); @@ -1085,8 +1089,10 @@ public class VideoModule extends CameraModule mMediaRecorder = new MediaRecorder(); // Unlock the camera object before passing it to media recorder. - mCameraDevice.unlock(); - mMediaRecorder.setCamera(mCameraDevice.getCamera()); + if (mCameraDevice != null) { + mCameraDevice.unlock(); + mMediaRecorder.setCamera(mCameraDevice.getCamera()); + } mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER); mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mMediaRecorder.setProfile(mProfile); @@ -1297,8 +1303,10 @@ public class VideoModule extends CameraModule if (bytes <= Storage.LOW_STORAGE_THRESHOLD_BYTES) { Log.w(TAG, "Storage issue, ignore the start request"); } else { - //?? - //if (!mCameraDevice.waitDone()) return; + if (mCameraDevice == null) { + Log.v(TAG, "in storage callback after camera closed"); + return; + } if (mPaused == true) { Log.v(TAG, "in storage callback after module paused"); return; @@ -1438,7 +1446,7 @@ public class VideoModule extends CameraModule mAppController.getCameraAppUI().showModeOptions(); mAppController.getCameraAppUI().animateBottomBarToFullSize(mShutterIconId); - if (!mPaused) { + if (!mPaused && mCameraDevice != null) { setFocusParameters(); mCameraDevice.lock(); if (!ApiHelper.HAS_SURFACE_TEXTURE_RECORDING) { @@ -1598,10 +1606,12 @@ public class VideoModule extends CameraModule CameraProfile.QUALITY_HIGH); mCameraSettings.setPhotoJpegCompressionQuality(jpegQuality); - mCameraDevice.applySettings(mCameraSettings); - // Nexus 5 through KitKat 4.4.2 requires a second call to - // .setParameters() for frame rate settings to take effect. - mCameraDevice.applySettings(mCameraSettings); + if (mCameraDevice != null) { + mCameraDevice.applySettings(mCameraSettings); + // Nexus 5 through KitKat 4.4.2 requires a second call to + // .setParameters() for frame rate settings to take effect. + mCameraDevice.applySettings(mCameraSettings); + } // Update UI based on the new parameters. mUI.updateOnScreenIndicators(mCameraSettings); @@ -1811,7 +1821,9 @@ public class VideoModule extends CameraModule mParameters.setFlashMode(flashMode); } }*/ - mCameraDevice.applySettings(mCameraSettings); + if (mCameraDevice != null) { + mCameraDevice.applySettings(mCameraSettings); + } mUI.updateOnScreenIndicators(mCameraSettings); } @@ -1914,13 +1926,17 @@ public class VideoModule extends CameraModule /***********************FocusOverlayManager Listener****************************/ @Override public void autoFocus() { - mCameraDevice.autoFocus(mHandler, mAutoFocusCallback); + if (mCameraDevice != null) { + mCameraDevice.autoFocus(mHandler, mAutoFocusCallback); + } } @Override public void cancelAutoFocus() { - mCameraDevice.cancelAutoFocus(); - setFocusParameters(); + if (mCameraDevice != null) { + mCameraDevice.cancelAutoFocus(); + setFocusParameters(); + } } @Override @@ -1940,8 +1956,9 @@ public class VideoModule extends CameraModule @Override public void setFocusParameters() { - updateFocusParameters(); - mCameraDevice.applySettings(mCameraSettings); + if (mCameraDevice != null) { + updateFocusParameters(); + mCameraDevice.applySettings(mCameraSettings); + } } - } -- cgit v1.2.3 From 4f222c4204471236180445e99dbe21b5c147b118 Mon Sep 17 00:00:00 2001 From: Senpo Hu Date: Mon, 29 Sep 2014 18:49:10 -0700 Subject: Stability: call stopPreview() before switching off video module. If the preview is not stopped, the following camera operations posted by other modules such as "apply settings" will turn camera object in turmoil. The camera object could start throwing exception and eventually hang. Bug: 16300704 Bug: 17403384 Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9 --- src/com/android/camera/VideoModule.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index f855d952c..73e5548ec 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -699,7 +699,9 @@ public class VideoModule extends CameraModule startVideoRecording(); } mAppController.setShutterEnabled(false); - mFocusManager.onShutterUp(mCameraSettings.getCurrentFocusMode()); + if (mCameraSettings != null) { + mFocusManager.onShutterUp(mCameraSettings.getCurrentFocusMode()); + } // Keep the shutter button disabled when in video capture intent // mode and recording is stopped. It'll be re-enabled when @@ -950,9 +952,16 @@ public class VideoModule extends CameraModule @Override public void stopPreview() { - if (!mPreviewing || mCameraDevice == null) { + if (!mPreviewing) { + Log.v(TAG, "Skip stopPreview since it's not mPreviewing"); + return; + } + if (mCameraDevice == null) { + Log.v(TAG, "Skip stopPreview since mCameraDevice is null"); return; } + + Log.v(TAG, "stopPreview"); mCameraDevice.stopPreview(); if (mFocusManager != null) { mFocusManager.onPreviewStopped(); @@ -1400,14 +1409,14 @@ public class VideoModule extends CameraModule } private boolean stopVideoRecording() { - Log.i(TAG, "stopVideoRecording"); - // Do nothing if camera device is still capturing photo. Monkey test can trigger app crashes // (b/17313985) without this check. Crash could also be reproduced by continuously tapping // on shutter button and preview with two fingers. if (mSnapshotInProgress) { + Log.v(TAG, "Skip stopVideoRecording since snapshot in progress"); return true; } + Log.v(TAG, "stopVideoRecording"); mUI.setSwipingEnabled(true); mUI.showFocusUI(true); @@ -1438,6 +1447,10 @@ public class VideoModule extends CameraModule // during recording. Release the camera as soon as possible because // face unlock or other applications may need to use the camera. if (mPaused) { + // b/16300704: Monkey is fast so it could pause the module while recording. + // stopPreview should definitely be called before switching off. + stopPreview(); + closeCamera(); } -- cgit v1.2.3 From aa27d014fcc70b799dfe38026308b017983366f1 Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Wed, 1 Oct 2014 16:52:56 -0700 Subject: Trap camera close exceptions on pause Bug: 17759456 Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55 --- src/com/android/camera/CameraActivity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 25735ed81..5fac0a803 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1638,8 +1638,6 @@ public class CameraActivity extends Activity performDeletion(); mCurrentModule.pause(); mOrientationManager.pause(); - // Close the camera and wait for the operation done. - mCameraController.closeCamera(true); mPanoramaViewHelper.onPause(); mLocalImagesObserver.setForegroundChangeListener(null); @@ -1652,6 +1650,17 @@ public class CameraActivity extends Activity UsageStatistics.instance().backgrounded(); + // Close the camera and wait for the operation done. But if we time out + // via RuntimeException, just continue pausing, and request a finish(). + try { + mCameraController.closeCamera(true); + } catch (RuntimeException e) { + Log.e(TAG, "Exception while closing camera", e); + if (!isFinishing()) { + finish(); + } + } + super.onPause(); } -- cgit v1.2.3 From b89df00529afc88eadc725414527f5aee041106f Mon Sep 17 00:00:00 2001 From: Alan Newberger Date: Thu, 2 Oct 2014 10:50:07 -0700 Subject: Trap CameraAgentFactory RTEs during recycle Bug: 17759456 Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e --- src/com/android/camera/CameraActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 5fac0a803..471c2757d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1871,9 +1871,13 @@ public class CameraActivity extends Activity mSettingsManager = null; mOrientationManager = null; mButtonManager = null; - CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); - CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO); mSoundPlayer.release(); + try { + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO); + } catch (RuntimeException e) { + Log.e(TAG, "CameraAgentFactory exception during destroy", e); + } super.onDestroy(); } -- cgit v1.2.3