summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/btn_new_shutter.xml6
-rw-r--r--res/drawable/btn_shutter_disabled.xml21
-rw-r--r--res/drawable/ic_eis_menu.xml17
-rw-r--r--res/drawable/ic_flash_auto.xml12
-rw-r--r--res/drawable/ic_flash_off.xml14
-rw-r--r--res/drawable/ic_flash_on.xml13
-rw-r--r--res/drawable/ic_hdr.xml18
-rw-r--r--res/drawable/ic_hdr_off.xml17
-rw-r--r--res/drawable/ic_location.xml14
-rw-r--r--res/drawable/ic_location_off.xml16
-rw-r--r--res/drawable/ic_muted_button.xml17
-rw-r--r--res/drawable/ic_notification.xml18
-rw-r--r--res/drawable/ic_refocus_editor_cancel.xml14
-rw-r--r--res/drawable/ic_refocus_editor_confirm.xml13
-rw-r--r--res/drawable/ic_sce.xml14
-rw-r--r--res/drawable/ic_sce_action.xml16
-rw-r--r--res/drawable/ic_sce_night.xml15
-rw-r--r--res/drawable/ic_sce_off.xml14
-rw-r--r--res/drawable/ic_sce_party.xml20
-rw-r--r--res/drawable/ic_sce_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_antishake.xml15
-rw-r--r--res/drawable/ic_scene_mode_auto.xml14
-rw-r--r--res/drawable/ic_scene_mode_backlight.xml16
-rw-r--r--res/drawable/ic_scene_mode_beach.xml15
-rw-r--r--res/drawable/ic_scene_mode_candlelight.xml17
-rw-r--r--res/drawable/ic_scene_mode_flower.xml18
-rw-r--r--res/drawable/ic_scene_mode_hdr.xml18
-rw-r--r--res/drawable/ic_scene_mode_landscape.xml11
-rw-r--r--res/drawable/ic_scene_mode_night.xml15
-rw-r--r--res/drawable/ic_scene_mode_optizoom.xml15
-rw-r--r--res/drawable/ic_scene_mode_portrait.xml12
-rw-r--r--res/drawable/ic_scene_mode_refocus.xml15
-rw-r--r--res/drawable/ic_scene_mode_smartauto.xml16
-rw-r--r--res/drawable/ic_scene_mode_snow.xml16
-rw-r--r--res/drawable/ic_scene_mode_sports.xml15
-rw-r--r--res/drawable/ic_scene_mode_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_text.xml13
-rw-r--r--res/drawable/ic_settings.xml11
-rw-r--r--res/drawable/ic_settings_beutification.xml16
-rw-r--r--res/drawable/ic_settings_bright_screen.xml13
-rw-r--r--res/drawable/ic_settings_chromaflash.xml11
-rw-r--r--res/drawable/ic_settings_continuous.xml13
-rw-r--r--res/drawable/ic_settings_countdowntimer.xml17
-rw-r--r--res/drawable/ic_settings_duration.xml16
-rw-r--r--res/drawable/ic_settings_exposure.xml13
-rw-r--r--res/drawable/ic_settings_facerec.xml18
-rw-r--r--res/drawable/ic_settings_filter.xml16
-rw-r--r--res/drawable/ic_settings_filter_on.xml16
-rw-r--r--res/drawable/ic_settings_flash.xml13
-rw-r--r--res/drawable/ic_settings_focus.xml20
-rw-r--r--res/drawable/ic_settings_focus_time.xml16
-rw-r--r--res/drawable/ic_settings_fps.xml20
-rw-r--r--res/drawable/ic_settings_iso.xml13
-rw-r--r--res/drawable/ic_settings_lightsource.xml16
-rw-r--r--res/drawable/ic_settings_location.xml14
-rw-r--r--res/drawable/ic_settings_picturesize.xml14
-rw-r--r--res/drawable/ic_settings_powershutter.xml14
-rw-r--r--res/drawable/ic_settings_quality.xml16
-rw-r--r--res/drawable/ic_settings_redeye.xml11
-rw-r--r--res/drawable/ic_settings_scenemode.xml14
-rw-r--r--res/drawable/ic_settings_selfiemirror.pngbin2153 -> 0 bytes
-rw-r--r--res/drawable/ic_settings_selfiemirror.xml15
-rw-r--r--res/drawable/ic_settings_storage.xml12
-rw-r--r--res/drawable/ic_settings_touchafec.xml18
-rw-r--r--res/drawable/ic_switch_back.xml13
-rw-r--r--res/drawable/ic_switch_camera.xml16
-rw-r--r--res/drawable/ic_switch_front.xml13
-rw-r--r--res/drawable/ic_switch_pan.xml12
-rw-r--r--res/drawable/ic_switch_video.xml12
-rw-r--r--res/drawable/ic_timer.xml17
-rw-r--r--res/drawable/ic_ts_makeup_back.xml13
-rw-r--r--res/drawable/ic_ts_makeup_clean_selector.xml31
-rw-r--r--res/drawable/ic_ts_makeup_custom_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_1_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_2_selector.xml35
-rw-r--r--res/drawable/ic_ts_makeup_level_3_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_off_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_off.xml16
-rw-r--r--res/drawable/ic_ts_makeup_on.xml16
-rw-r--r--res/drawable/ic_ts_makeup_whiten_selector.xml34
-rw-r--r--res/drawable/ic_unmuted_button.xml15
-rw-r--r--res/drawable/ic_videocam_white_24dp.xml14
-rw-r--r--res/drawable/one_ui_shutter_1.pngbin2957 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_2.pngbin3062 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_3.pngbin3184 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_4.pngbin3131 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_5.pngbin2947 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_6.pngbin2699 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_anim.xml72
-rw-r--r--res/drawable/photo_capture.pngbin3153 -> 0 bytes
-rw-r--r--res/drawable/pick_the_best_photo.xml12
-rw-r--r--res/drawable/pick_the_best_photo_selected.xml16
-rw-r--r--res/drawable/pick_the_best_photo_unselected.xml15
-rw-r--r--res/drawable/remaining_sheets.xml11
-rw-r--r--res/drawable/shutter_button_anim.xml73
-rw-r--r--res/drawable/shutter_button_normal.xml17
-rw-r--r--res/drawable/shutter_button_pressed.xml17
-rw-r--r--res/drawable/shutter_button_stop.xml17
-rw-r--r--res/drawable/shutter_button_video.xml17
-rw-r--r--res/drawable/shutter_button_video_dim.xml17
-rw-r--r--res/drawable/shutter_button_video_stop.xml17
-rw-r--r--res/drawable/shutter_panorama.xml17
-rw-r--r--res/drawable/shutter_panorama_dim.xml17
-rw-r--r--res/drawable/video_capture.pngbin2529 -> 0 bytes
104 files changed, 1360 insertions, 314 deletions
diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml
index 5b9d6f724..a41581238 100644
--- a/res/drawable/btn_new_shutter.xml
+++ b/res/drawable/btn_new_shutter.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" />
- <item android:drawable="@drawable/shutter_button_0" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/shutter_button_pressed" />
+ <item android:drawable="@drawable/shutter_button_normal" />
</selector>
-
diff --git a/res/drawable/btn_shutter_disabled.xml b/res/drawable/btn_shutter_disabled.xml
deleted file mode 100644
index 865d83c38..000000000
--- a/res/drawable/btn_shutter_disabled.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/btn_shutter_pressed_disabled" />
- <item android:drawable="@drawable/btn_shutter_default_disabled" />
-</selector>
-
diff --git a/res/drawable/ic_eis_menu.xml b/res/drawable/ic_eis_menu.xml
new file mode 100644
index 000000000..8f022d687
--- /dev/null
+++ b/res/drawable/ic_eis_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <clip-path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 5.5V20c0 2.2-1.8 4-4 4h-7.3c-1.08 0-2.1-.43-2.85-1.19L1 14.83s1.26-1.23
+1.3-1.25c.22-.19 .49 -.29 .79 -.29 .22 0 .42 .06 .6 .16 .04 .01 4.31 2.46 4.31
+2.46V4c0-.83 .67 -1.5 1.5-1.5S11 3.17 11 4v7h1V1.5c0-.83 .67 -1.5 1.5-1.5S15 .67
+15 1.5V11h1V2.5c0-.83 .67 -1.5 1.5-1.5s1.5 .67 1.5 1.5V11h1V5.5c0-.83 .67 -1.5
+1.5-1.5s1.5 .67 1.5 1.5z" />
+</vector>
diff --git a/res/drawable/ic_flash_auto.xml b/res/drawable/ic_flash_auto.xml
new file mode 100644
index 000000000..94d2d9cd6
--- /dev/null
+++ b/res/drawable/ic_flash_auto.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 2v12h3v9l7-12H9l4-9H3zm16 0h-2l-3.2 9h1.9l.7-2h3.2l.7 2h1.9L19 2zm-2.15
+5.65L18 4l1.15 3.65h-2.3z" />
+</vector>
diff --git a/res/drawable/ic_flash_off.xml b/res/drawable/ic_flash_off.xml
new file mode 100644
index 000000000..c3b61d333
--- /dev/null
+++ b/res/drawable/ic_flash_off.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3.27 3L2 4.27l5 5V13h3v9l3.58-6.14L17.73 20 19 18.73 3.27 3zM17
+10h-4l4-8H7v2.18l8.46 8.46L17 10z" />
+</vector>
diff --git a/res/drawable/ic_flash_on.xml b/res/drawable/ic_flash_on.xml
new file mode 100644
index 000000000..e0ed36f3e
--- /dev/null
+++ b/res/drawable/ic_flash_on.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7 2v11h3v9l7-12h-4l4-8z" />
+</vector>
diff --git a/res/drawable/ic_hdr.xml b/res/drawable/ic_hdr.xml
new file mode 100644
index 000000000..63e9e3438
--- /dev/null
+++ b/res/drawable/ic_hdr.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22h-4v-8h-4v20h4v-8h4v8h4v-20h-4v8zm14-8h-8v20h8c2.21 0 4-1.79
+4-4v-12c0-2.21-1.79-4-4-4zm0
+16h-4v-12h4v12zm18-8v-4c0-2.21-1.79-4-4-4h-8v20h4v-8h2l2 8h4l-2.38-8.35c1.4-.62
+2.38-2.02 2.38-3.65zm-4 0h-4v-4h4v4z" />
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+</vector>
diff --git a/res/drawable/ic_hdr_off.xml b/res/drawable/ic_hdr_off.xml
new file mode 100644
index 000000000..7e1d8be23
--- /dev/null
+++ b/res/drawable/ic_hdr_off.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48zm0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M36 34l-29.46-29.45-2.54 2.54 8 8v6.91h-4v-8h-4v20h4v-8h4v8h4v-14.91l2
+2v12.91h8c1.34 0 2.51-.66 3.24-1.67l12.67 12.67
+2.54-2.55-8.45-8.45zm-10-4h-4v-4.91l4 4v.91zm10-4h2l1.64 6.54 1.45
+1.46h2.91l-2.38-8.35c1.4-.62 2.38-2.02 2.38-3.65v-4c0-2.21-1.79-4-4-4h-8v10.91l4
+4v-2.91zm0-8h4v4h-4v-4zm-6 4.91v-4.91c0-2.21-1.79-4-4-4h-4.91l8.91 8.91z" />
+</vector>
diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml
new file mode 100644
index 000000000..9151b8a38
--- /dev/null
+++ b/res/drawable/ic_location.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_location_off.xml b/res/drawable/ic_location_off.xml
new file mode 100644
index 000000000..416c62707
--- /dev/null
+++ b/res/drawable/ic_location_off.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0zm11.75 11.47l-.11-.11z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 6.5c1.38 0 2.5 1.12 2.5 2.5 0 .74-.33 1.39-.83 1.85l3.63 3.63c.98-1.86
+1.7-3.8 1.7-5.48 0-3.87-3.13-7-7-7-1.98 0-3.76 .83 -5.04 2.15l3.19 3.19c.46-.52
+1.11-.84 1.85-.84zm4.37 9.6l-4.63-4.63-.11-.11L3.27 3 2 4.27l3.18 3.18C5.07 7.95
+5 8.47 5 9c0 5.25 7 13 7 13s1.67-1.85 3.38-4.35L18.73 21 20 19.73l-3.63-3.63z" />
+</vector>
diff --git a/res/drawable/ic_muted_button.xml b/res/drawable/ic_muted_button.xml
new file mode 100644
index 000000000..4c74e210d
--- /dev/null
+++ b/res/drawable/ic_muted_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0zm0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19 11h-1.7c0 .74-.16 1.43-.43 2.05l1.23 1.23c.56-.98 .9 -2.09 .9 -3.28zm-4.02
+.17 c0-.06 .02 -.11 .02 -.17V5c0-1.66-1.34-3-3-3S9 3.34 9 5v.18l5.98 5.99zM4.27
+3L3 4.27l6.01 6.01V11c0 1.66 1.33 3 2.99 3 .22 0 .44-.03 .65 -.08l1.66 1.66c-.71
+.33 -1.5 .52 -2.31 .52 -2.76 0-5.3-2.1-5.3-5.1H5c0 3.41 2.72 6.23 6
+6.72V21h2v-3.28c.91-.13 1.77-.45 2.54-.9L19.73 21 21 19.73 4.27 3z" />
+</vector>
diff --git a/res/drawable/ic_notification.xml b/res/drawable/ic_notification.xml
new file mode 100644
index 000000000..68792602f
--- /dev/null
+++ b/res/drawable/ic_notification.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
+5-2.24 5-5 5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_refocus_editor_cancel.xml b/res/drawable/ic_refocus_editor_cancel.xml
new file mode 100644
index 000000000..657fb4429
--- /dev/null
+++ b/res/drawable/ic_refocus_editor_cancel.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_refocus_editor_confirm.xml b/res/drawable/ic_refocus_editor_confirm.xml
new file mode 100644
index 000000000..088df07c7
--- /dev/null
+++ b/res/drawable/ic_refocus_editor_confirm.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+</vector>
diff --git a/res/drawable/ic_sce.xml b/res/drawable/ic_sce.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_sce.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_action.xml b/res/drawable/ic_sce_action.xml
new file mode 100644
index 000000000..e73dd7f40
--- /dev/null
+++ b/res/drawable/ic_sce_action.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1
+2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9
+0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5 .1 -.8 .1 l-5.2
+2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z" />
+</vector>
diff --git a/res/drawable/ic_sce_night.xml b/res/drawable/ic_sce_night.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/ic_sce_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_sce_off.xml b/res/drawable/ic_sce_off.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_sce_off.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_party.xml b/res/drawable/ic_sce_party.xml
new file mode 100644
index 000000000..86cc51068
--- /dev/null
+++ b/res/drawable/ic_sce_party.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 6c1.11 0 2-.9 2-2 0-.38-.1-.73-.29-1.03L12 0l-1.71 2.97c-.19 .3 -.29 .65
+-.29 1.03 0 1.1 .9 2 2 2zm4.6 9.99l-1.07-1.07-1.08 1.07c-1.3 1.3-3.58 1.31-4.89
+0l-1.07-1.07-1.09 1.07C6.75 16.64 5.88 17 4.96 17c-.73 0-1.4-.23-1.96-.61V21c0
+.55 .45 1 1 1h16c.55 0 1-.45 1-1v-4.61c-.56 .38 -1.23 .61 -1.96 .61 -.92
+0-1.79-.36-2.44-1.01zM18 9h-5V7h-2v2H6c-1.66 0-3 1.34-3 3v1.54c0 1.08 .88 1.96
+1.96 1.96 .52 0 1.02-.2 1.38-.57l2.14-2.13 2.13 2.13c.74 .74 2.03 .74 2.77
+0l2.14-2.13 2.13 2.13c.37 .37 .86 .57 1.38 .57 1.08 0 1.96-.88 1.96-1.96V12C21
+10.34 19.66 9 18 9z" />
+</vector>
diff --git a/res/drawable/ic_sce_sunset.xml b/res/drawable/ic_sce_sunset.xml
new file mode 100644
index 000000000..837b321a0
--- /dev/null
+++ b/res/drawable/ic_sce_sunset.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_antishake.xml b/res/drawable/ic_scene_mode_antishake.xml
new file mode 100644
index 000000000..5b5279a5a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_antishake.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 5.5V20c0 2.2-1.8 4-4 4h-7.3c-1.08 0-2.1-.43-2.85-1.19L1 14.83s1.26-1.23
+1.3-1.25c.22-.19 .49 -.29 .79 -.29 .22 0 .42 .06 .6 .16 .04 .01 4.31 2.46 4.31
+2.46V4c0-.83 .67 -1.5 1.5-1.5S11 3.17 11 4v7h1V1.5c0-.83 .67 -1.5 1.5-1.5S15 .67
+15 1.5V11h1V2.5c0-.83 .67 -1.5 1.5-1.5s1.5 .67 1.5 1.5V11h1V5.5c0-.83 .67 -1.5
+1.5-1.5s1.5 .67 1.5 1.5z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_auto.xml b/res/drawable/ic_scene_mode_auto.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_scene_mode_auto.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_backlight.xml b/res/drawable/ic_scene_mode_backlight.xml
new file mode 100644
index 000000000..64b228eaa
--- /dev/null
+++ b/res/drawable/ic_scene_mode_backlight.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3.55 18.54l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8zM11 22.45h2V19.5h-2v2.95zM4
+10.5H1v2h3v-2zm11-4.19V1.5H9v4.81C7.21 7.35 6 9.28 6 11.5c0 3.31 2.69 6 6
+6s6-2.69 6-6c0-2.22-1.21-4.15-3-5.19zm5 4.19v2h3v-2h-3zm-2.76 7.66l1.79 1.8
+1.41-1.41-1.8-1.79-1.4 1.4z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_beach.xml b/res/drawable/ic_scene_mode_beach.xml
new file mode 100644
index 000000000..371649809
--- /dev/null
+++ b/res/drawable/ic_scene_mode_beach.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.127 14.56l1.43-1.43 6.44 6.443L19.57
+21zm4.293-5.73l2.86-2.86c-3.95-3.95-10.35-3.96-14.3-.02 3.93-1.3 8.31-.25 11.44
+2.88zM5.95 5.98c-3.94 3.95-3.93 10.35 .02 14.3l2.86-2.86C5.7 14.29 4.65 9.91
+5.95 5.98zm.02-.02l-.01 .01 c-.38 3.01 1.17 6.88 4.3
+10.02l5.73-5.73c-3.13-3.13-7.01-4.68-10.02-4.3z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_candlelight.xml b/res/drawable/ic_scene_mode_candlelight.xml
new file mode 100644
index 000000000..4be42ebd2
--- /dev/null
+++ b/res/drawable/ic_scene_mode_candlelight.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.5 .67 s.74 2.65 .74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07
+0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58
+8-8C20 8.61 17.41 3.8 13.5 .67 zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62
+1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58 .39 1.29 .59 2.65 .59 4.04 0
+2.65-2.15 4.8-4.8 4.8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_flower.xml b/res/drawable/ic_scene_mode_flower.xml
new file mode 100644
index 000000000..a738f4c2a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_flower.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22c4.97 0 9-4.03 9-9-4.97 0-9 4.03-9 9zM5.6 10.25c0 1.38 1.12 2.5 2.5 2.5
+.53 0 1.01-.16 1.42-.44l-.02 .19 c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12
+2.5-2.5l-.02-.19c.4 .28 .89 .44 1.42 .44 1.38 0 2.5-1.12 2.5-2.5
+0-1-.59-1.85-1.43-2.25 .84 -.4 1.43-1.25 1.43-2.25 0-1.38-1.12-2.5-2.5-2.5-.53
+0-1.01 .16 -1.42 .44 l.02-.19C14.5 2.12 13.38 1 12 1S9.5 2.12 9.5 3.5l.02 .19
+c-.4-.28-.89-.44-1.42-.44-1.38 0-2.5 1.12-2.5 2.5 0 1 .59 1.85 1.43 2.25-.84 .4
+-1.43 1.25-1.43 2.25zM12 5.5c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5S9.5 9.38
+9.5 8s1.12-2.5 2.5-2.5zM3 13c0 4.97 4.03 9 9 9 0-4.97-4.03-9-9-9z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_hdr.xml b/res/drawable/ic_scene_mode_hdr.xml
new file mode 100644
index 000000000..63e9e3438
--- /dev/null
+++ b/res/drawable/ic_scene_mode_hdr.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22h-4v-8h-4v20h4v-8h4v8h4v-20h-4v8zm14-8h-8v20h8c2.21 0 4-1.79
+4-4v-12c0-2.21-1.79-4-4-4zm0
+16h-4v-12h4v12zm18-8v-4c0-2.21-1.79-4-4-4h-8v20h4v-8h2l2 8h4l-2.38-8.35c1.4-.62
+2.38-2.02 2.38-3.65zm-4 0h-4v-4h4v4z" />
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_landscape.xml b/res/drawable/ic_scene_mode_landscape.xml
new file mode 100644
index 000000000..258f002e1
--- /dev/null
+++ b/res/drawable/ic_scene_mode_landscape.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14 6l-3.75 5 2.85 3.8-1.6 1.2C9.81 13.75 7 10 7 10l-6 8h22L14 6z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_night.xml b/res/drawable/ic_scene_mode_night.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/ic_scene_mode_night.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_optizoom.xml b/res/drawable/ic_scene_mode_optizoom.xml
new file mode 100644
index 000000000..eba10e65a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_optizoom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20 4h-3.17L15 2H9L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2zm-8 3c1.63 0 3.06 .79 3.98 2H12c-1.66 0-3 1.34-3 3 0 .35
+.07 .69 .18 1H7.1c-.06-.32-.1-.66-.1-1 0-2.76 2.24-5 5-5zm0 10c-1.63
+0-3.06-.79-3.98-2H12c1.66 0 3-1.34 3-3 0-.35-.07-.69-.18-1h2.08c.07 .32 .1 .66
+.1 1 0 2.76-2.24 5-5 5z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_portrait.xml b/res/drawable/ic_scene_mode_portrait.xml
new file mode 100644
index 000000000..587964d1a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_portrait.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8
+4v2h16v-2c0-2.66-5.33-4-8-4z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_refocus.xml b/res/drawable/ic_scene_mode_refocus.xml
new file mode 100644
index 000000000..e8cbdf2f0
--- /dev/null
+++ b/res/drawable/ic_scene_mode_refocus.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10h8c1.1 0
+2-.9 2-2v-8c0-5.51-4.49-10-10-10zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8
+8-3.59 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_smartauto.xml b/res/drawable/ic_scene_mode_smartauto.xml
new file mode 100644
index 000000000..26799fc99
--- /dev/null
+++ b/res/drawable/ic_scene_mode_smartauto.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 7V1h-6v2H7V1H1v6h2v10H1v6h6v-2h10v2h6v-6h-2V7h2zM3 3h2v2H3V3zm2
+18H3v-2h2v2zm12-2H7v-2H5V7h2V5h10v2h2v10h-2v2zm4 2h-2v-2h2v2zM19
+5V3h2v2h-2zm-5.27 9h-3.49l-.73 2H7.89l3.4-9h1.4l3.41
+9h-1.63l-.74-2zm-3.04-1.26h2.61L12 8.91l-1.31 3.83z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_snow.xml b/res/drawable/ic_scene_mode_snow.xml
new file mode 100644
index 000000000..564a4be0d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_snow.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 11h-4.17l3.24-3.24-1.41-1.42L15 11h-2V9l4.66-4.66-1.42-1.41L13
+6.17V2h-2v4.17L7.76 2.93 6.34 4.34 11 9v2H9L4.34 6.34 2.93 7.76 6.17
+11H2v2h4.17l-3.24 3.24 1.41 1.42L9 13h2v2l-4.66 4.66 1.42 1.41L11
+17.83V22h2v-4.17l3.24 3.24 1.42-1.41L13 15v-2h2l4.66 4.66 1.41-1.42L17.83 13H22z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sports.xml b/res/drawable/ic_scene_mode_sports.xml
new file mode 100644
index 000000000..7af0f67f3
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sports.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 19.5 18 C 20.3284271247 18 21 18.6715728753 21 19.5 C 21 20.3284271247 20.3284271247 21 19.5 21 C 18.6715728753 21 18 20.3284271247 18 19.5 C 18 18.6715728753 18.6715728753 18 19.5 18 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 5.92L9 2v18H7v-1.73c-1.79 .35 -3 .99-3 1.73 0 1.1 2.69 2 6 2s6-.9
+6-2c0-.99-2.16-1.81-5-1.97V8.98l6-3.06z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sunset.xml b/res/drawable/ic_scene_mode_sunset.xml
new file mode 100644
index 000000000..837b321a0
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sunset.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_text.xml b/res/drawable/ic_scene_mode_text.xml
new file mode 100644
index 000000000..737e75254
--- /dev/null
+++ b/res/drawable/ic_scene_mode_text.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z" />
+</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..53362485c
--- /dev/null
+++ b/res/drawable/ic_settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_beutification.xml b/res/drawable/ic_settings_beutification.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_settings_beutification.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_settings_bright_screen.xml b/res/drawable/ic_settings_bright_screen.xml
new file mode 100644
index 000000000..825098584
--- /dev/null
+++ b/res/drawable/ic_settings_bright_screen.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31
+20H20v-4.69L23.31 12 20 8.69zM12 18c-.89 0-1.74-.2-2.5-.55C11.56 16.5 13 14.42
+13 12s-1.44-4.5-3.5-5.45C10.26 6.2 11.11 6 12 6c3.31 0 6 2.69 6 6s-2.69 6-6 6z" />
+</vector>
diff --git a/res/drawable/ic_settings_chromaflash.xml b/res/drawable/ic_settings_chromaflash.xml
new file mode 100644
index 000000000..a2cb90e1c
--- /dev/null
+++ b/res/drawable/ic_settings_chromaflash.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7,2H17L13.5,9H17L10,22V14H7V2M9,4V12H12V14.66L14,11H10.24L13.76,4H9Z" />
+</vector>
diff --git a/res/drawable/ic_settings_continuous.xml b/res/drawable/ic_settings_continuous.xml
new file mode 100644
index 000000000..9b1945e29
--- /dev/null
+++ b/res/drawable/ic_settings_continuous.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15.96 10.29l-2.75 3.54-1.96-2.36L8.5 15h11l-3.54-4.71zM3 5H1v16c0 1.1 .9 2 2
+2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_settings_countdowntimer.xml b/res/drawable/ic_settings_countdowntimer.xml
new file mode 100644
index 000000000..887adeb24
--- /dev/null
+++ b/res/drawable/ic_settings_countdowntimer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</vector>
diff --git a/res/drawable/ic_settings_duration.xml b/res/drawable/ic_settings_duration.xml
new file mode 100644
index 000000000..ad7cb0f26
--- /dev/null
+++ b/res/drawable/ic_settings_duration.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7.88 3.39L6.6 1.86 2 5.71l1.29 1.53 4.59-3.85zM22 5.72l-4.6-3.86-1.29 1.53 4.6
+3.86L22 5.72zM12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9c4.97 0 9-4.03
+9-9s-4.03-9-9-9zm0 16c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7
+7zm1-11h-2v3H8v2h3v3h2v-3h3v-2h-3V9z" />
+</vector>
diff --git a/res/drawable/ic_settings_exposure.xml b/res/drawable/ic_settings_exposure.xml
new file mode 100644
index 000000000..9cd119f5d
--- /dev/null
+++ b/res/drawable/ic_settings_exposure.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 6c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zM5 8c-2.21 0-4 1.79-4
+4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2
+2z" />
+</vector>
diff --git a/res/drawable/ic_settings_facerec.xml b/res/drawable/ic_settings_facerec.xml
new file mode 100644
index 000000000..46d43647b
--- /dev/null
+++ b/res/drawable/ic_settings_facerec.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 11.75c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25 1.25-.56
+1.25-1.25-.56-1.25-1.25-1.25zm6 0c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25
+1.25-.56 1.25-1.25-.56-1.25-1.25-1.25zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10
+10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8 0-.29 .02 -.58 .05 -.86
+2.36-1.05 4.23-2.98 5.21-5.37C11.07 8.33 14.05 10 17.42 10c.78 0 1.53-.09
+2.25-.26 .21 .71 .33 1.47 .33 2.26 0 4.41-3.59 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_filter.xml b/res/drawable/ic_settings_filter.xml
new file mode 100644
index 000000000..9f0e4ed77
--- /dev/null
+++ b/res/drawable/ic_settings_filter.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09
+2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15
+L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31
+.76 1.05 1.22 1.83 1.23 .26 0 .52-.05 .77 -.15l7.36-3.05c1.02-.42 1.51-1.59
+1.09-2.6zM7.88 8.75c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-2 11c0 1.1
+.9 2 2 2h1.45l-3.45-8.34v6.34z" />
+</vector>
diff --git a/res/drawable/ic_settings_filter_on.xml b/res/drawable/ic_settings_filter_on.xml
new file mode 100644
index 000000000..9f0e4ed77
--- /dev/null
+++ b/res/drawable/ic_settings_filter_on.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09
+2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15
+L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31
+.76 1.05 1.22 1.83 1.23 .26 0 .52-.05 .77 -.15l7.36-3.05c1.02-.42 1.51-1.59
+1.09-2.6zM7.88 8.75c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-2 11c0 1.1
+.9 2 2 2h1.45l-3.45-8.34v6.34z" />
+</vector>
diff --git a/res/drawable/ic_settings_flash.xml b/res/drawable/ic_settings_flash.xml
new file mode 100644
index 000000000..5de3ba969
--- /dev/null
+++ b/res/drawable/ic_settings_flash.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M7 2v11h3v9l7-12h-4l4-8z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus.xml b/res/drawable/ic_settings_focus.xml
new file mode 100644
index 000000000..5483d5475
--- /dev/null
+++ b/res/drawable/ic_settings_focus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86 2.44-1.44
+3.9-1.62zm7.32 .19 C16.84 3.05 15.01 2.25 13 2.05v2.02c1.46 .18 2.79 .76 3.9
+1.62l1.42-1.43zM19.93 11h2.02c-.2-2.01-1-3.84-2.21-5.32L18.31 7.1c.86 1.11 1.44
+2.44 1.62 3.9zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46 .76
+-2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zM15 12c0-1.66-1.34-3-3-3s-3 1.34-3 3
+1.34 3 3 3 3-1.34 3-3zm3.31 4.9l1.43 1.43c1.21-1.48 2.01-3.32
+2.21-5.32h-2.02c-.18 1.45-.76 2.78-1.62 3.89zM13 19.93v2.02c2.01-.2 3.84-1
+5.32-2.21l-1.43-1.43c-1.1 .86 -2.43 1.44-3.89 1.62zm-7.32-.19C7.16 20.95 9 21.75
+11 21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus_time.xml b/res/drawable/ic_settings_focus_time.xml
new file mode 100644
index 000000000..c6a2e29bb
--- /dev/null
+++ b/res/drawable/ic_settings_focus_time.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16.21 4.16l4 4v-4zm4 12l-4 4h4zm-12
+4l-4-4v4zm-4-12l4-4h-4zm12.95-.95c-2.73-2.73-7.17-2.73-9.9 0s-2.73 7.17 0 9.9
+7.17 2.73 9.9 0 2.73-7.16 0-9.9zm-1.1 8.8c-2.13 2.13-5.57 2.13-7.7 0s-2.13-5.57
+0-7.7 5.57-2.13 7.7 0 2.13 5.57 0 7.7z" />
+ <path
+ android:pathData="M.21 .16 h24v24h-24z" />
+</vector>
diff --git a/res/drawable/ic_settings_fps.xml b/res/drawable/ic_settings_fps.xml
new file mode 100644
index 000000000..a94b5c35c
--- /dev/null
+++ b/res/drawable/ic_settings_fps.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0V0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.05 9.79L10 7.5v9l3.05-2.29L16 12zm0 0L10 7.5v9l3.05-2.29L16 12zm0 0L10
+7.5v9l3.05-2.29L16 12zM11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86
+2.44-1.44 3.9-1.62zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46
+.76 -2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zm1.61 6.74C7.16 20.95 9 21.75 11
+21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43zM22 12c0 5.16-3.92 9.42-8.95
+9.95v-2.02C16.97 19.41 20 16.05 20 12s-3.03-7.41-6.95-7.93V2.05C18.08 2.58 22
+6.84 22 12z" />
+</vector>
diff --git a/res/drawable/ic_settings_iso.xml b/res/drawable/ic_settings_iso.xml
new file mode 100644
index 000000000..5292fa9da
--- /dev/null
+++ b/res/drawable/ic_settings_iso.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2V5c0-1.1-.9-2-2-2zM5.5 7.5h2v-2H9v2h2V9H9v2H7.5V9h-2V7.5zM19 19H5L19
+5v14zm-2-2v-1.5h-5V17h5z" />
+</vector>
diff --git a/res/drawable/ic_settings_lightsource.xml b/res/drawable/ic_settings_lightsource.xml
new file mode 100644
index 000000000..421ef259f
--- /dev/null
+++ b/res/drawable/ic_settings_lightsource.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1
+17.93c-3.94-.49-7-3.85-7-7.93s3.05-7.44 7-7.93v15.86zm2-15.86c1.03 .13 2 .45
+2.87 .93 H13v-.93zM13 7h5.24c.25 .31 .48 .65 .68 1H13V7zm0 3h6.74c.08 .33 .15
+.66 .19 1H13v-1zm0 9.93V19h2.87c-.87 .48 -1.84 .8 -2.87 .93 zM18.24
+17H13v-1h5.92c-.2 .35 -.43 .69 -.68 1zm1.5-3H13v-1h6.93c-.04 .34 -.11 .67 -.19
+1z" />
+</vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
new file mode 100644
index 000000000..9151b8a38
--- /dev/null
+++ b/res/drawable/ic_settings_location.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_picturesize.xml b/res/drawable/ic_settings_picturesize.xml
new file mode 100644
index 000000000..e74229fc8
--- /dev/null
+++ b/res/drawable/ic_settings_picturesize.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16 10h-2v2h2v-2zm0 4h-2v2h2v-2zm-8-4H6v2h2v-2zm4 0h-2v2h2v-2zm8-6H4c-1.1 0-2
+.9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V6h16v12z" />
+</vector>
diff --git a/res/drawable/ic_settings_powershutter.xml b/res/drawable/ic_settings_powershutter.xml
new file mode 100644
index 000000000..1f723df09
--- /dev/null
+++ b/res/drawable/ic_settings_powershutter.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 4V1h2v3h3v2H5v3H3V6H0V4h3zm3 6V7h3V4h7l1.83 2H21c1.1 0 2 .9 2 2v12c0 1.1-.9
+2-2 2H5c-1.1 0-2-.9-2-2V10h3zm7 9c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24
+5 5 5zm-3.2-5c0 1.77 1.43 3.2 3.2 3.2s3.2-1.43 3.2-3.2-1.43-3.2-3.2-3.2-3.2
+1.43-3.2 3.2z" />
+</vector>
diff --git a/res/drawable/ic_settings_quality.xml b/res/drawable/ic_settings_quality.xml
new file mode 100644
index 000000000..6d76669a6
--- /dev/null
+++ b/res/drawable/ic_settings_quality.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M24 24H0V0h24v24z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 15h2v2h-2v-2zm0-4h2v2h-2v-2zm2 8h-2v2c1 0 2-1 2-2zM13 3h2v2h-2V3zm8
+4h2v2h-2V7zm0-4v2h2c0-1-1-2-2-2zM1 7h2v2H1V7zm16-4h2v2h-2V3zm0 16h2v2h-2v-2zM3
+3C2 3 1 4 1 5h2V3zm6 0h2v2H9V3zM5 3h2v2H5V3zm-4 8v8c0 1.1 .9 2 2 2h12V11H1zm2
+8l2.5-3.21 1.79 2.15 2.5-3.22L13 19H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_redeye.xml b/res/drawable/ic_settings_redeye.xml
new file mode 100644
index 000000000..0cea289af
--- /dev/null
+++ b/res/drawable/ic_settings_redeye.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16,5C15.44,5 15,5.44 15,6C15,6.56 15.44,7 16,7C16.56,7 17,6.56 17,6C17,5.44 16.56,5 16,5M16,2C13.27,2 10.94,3.66 10,6C10.94,8.34 13.27,10 16,10C18.73,10 21.06,8.34 22,6C21.06,3.66 18.73,2 16,2M16,3.5A2.5,2.5 0 0,1 18.5,6A2.5,2.5 0 0,1 16,8.5A2.5,2.5 0 0,1 13.5,6A2.5,2.5 0 0,1 16,3.5M3,2V14H6V23L13,11H9L10.12,8.5C9.44,7.76 8.88,6.93 8.5,6C9.19,4.29 10.5,2.88 12.11,2H3Z" />
+</vector>
diff --git a/res/drawable/ic_settings_scenemode.xml b/res/drawable/ic_settings_scenemode.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_settings_scenemode.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_settings_selfiemirror.png b/res/drawable/ic_settings_selfiemirror.png
deleted file mode 100644
index 7d99f5c2c..000000000
--- a/res/drawable/ic_settings_selfiemirror.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_settings_selfiemirror.xml b/res/drawable/ic_settings_selfiemirror.xml
new file mode 100644
index 000000000..d6ea4cc50
--- /dev/null
+++ b/res/drawable/ic_settings_selfiemirror.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 5v14c0 1.1 .89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2H5c-1.11 0-2 .9-2
+2zm12 4c0 1.66-1.34 3-3 3s-3-1.34-3-3 1.34-3 3-3 3 1.34 3 3zm-9 8c0-2 4-3.1
+6-3.1s6 1.1 6 3.1v1H6v-1z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
new file mode 100644
index 000000000..a880b4207
--- /dev/null
+++ b/res/drawable/ic_settings_storage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18 2h-8L4.02 8 4 20c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-6
+6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z" />
+</vector>
diff --git a/res/drawable/ic_settings_touchafec.xml b/res/drawable/ic_settings_touchafec.xml
new file mode 100644
index 000000000..357ff6759
--- /dev/null
+++ b/res/drawable/ic_settings_touchafec.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <clip-path
+ android:pathData="M0 0h24v24H0V0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 11.24V7.5C9 6.12 10.12 5 11.5 5S14 6.12 14 7.5v3.74c1.21-.81 2-2.18 2-3.74C16
+5.01 13.99 3 11.5 3S7 5.01 7 7.5c0 1.56 .79 2.93 2 3.74zm9.84
+4.63l-4.54-2.26c-.17-.07-.35-.11-.54-.11H13v-6c0-.83-.67-1.5-1.5-1.5S10 6.67 10
+7.5v10.74l-3.43-.72c-.08-.01-.15-.03-.24-.03-.31 0-.59 .13 -.79 .33 l-.79 .8
+4.94 4.94c.27 .27 .65 .44 1.06 .44 h6.79c.75 0 1.33-.55
+1.44-1.28l.75-5.27c.01-.07 .02 -.14 .02 -.2 0-.62-.38-1.16-.91-1.38z" />
+</vector>
diff --git a/res/drawable/ic_switch_back.xml b/res/drawable/ic_switch_back.xml
new file mode 100644
index 000000000..85504d616
--- /dev/null
+++ b/res/drawable/ic_switch_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zm3-20H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2
+2h10c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm-5 6c-1.11 0-2-.9-2-2s.89-2 1.99-2 2 .9 2
+2C14 5.1 13.1 6 12 6z" />
+</vector>
diff --git a/res/drawable/ic_switch_camera.xml b/res/drawable/ic_switch_camera.xml
new file mode 100644
index 000000000..7dfd1f211
--- /dev/null
+++ b/res/drawable/ic_switch_camera.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
+5-2.24 5-5 5z" />
+</vector>
diff --git a/res/drawable/ic_switch_front.xml b/res/drawable/ic_switch_front.xml
new file mode 100644
index 000000000..c2bc25110
--- /dev/null
+++ b/res/drawable/ic_switch_front.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zM12 8c1.1 0 2-.9 2-2s-.9-2-2-2-1.99 .9
+-1.99 2S10.9 8 12 8zm5-8H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2 2h10c1.1 0 2-.9
+2-2V2c0-1.1-.9-2-2-2zM7 2h10v10.5c0-1.67-3.33-2.5-5-2.5s-5 .83-5 2.5V2z" />
+</vector>
diff --git a/res/drawable/ic_switch_pan.xml b/res/drawable/ic_switch_pan.xml
new file mode 100644
index 000000000..cbce6ba87
--- /dev/null
+++ b/res/drawable/ic_switch_pan.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 18V6c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h18c1.1 0 2-.9
+2-2zM8.5 12.5l2.5 3.01L14.5 11l4.5 6H5l3.5-4.5z" />
+</vector>
diff --git a/res/drawable/ic_switch_video.xml b/res/drawable/ic_switch_video.xml
new file mode 100644
index 000000000..e4dbbe9d2
--- /dev/null
+++ b/res/drawable/ic_switch_video.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55 .45 1 1 1h12c.55 0 1-.45
+1-1v-3.5l4 4v-11l-4 4z" />
+</vector>
diff --git a/res/drawable/ic_timer.xml b/res/drawable/ic_timer.xml
new file mode 100644
index 000000000..887adeb24
--- /dev/null
+++ b/res/drawable/ic_timer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_back.xml b/res/drawable/ic_ts_makeup_back.xml
new file mode 100644
index 000000000..7971b4f1c
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_clean_selector.xml b/res/drawable/ic_ts_makeup_clean_selector.xml
index 791658dd4..e62155b66 100644
--- a/res/drawable/ic_ts_makeup_clean_selector.xml
+++ b/res/drawable/ic_ts_makeup_clean_selector.xml
@@ -1,22 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_clean_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_clean" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7.5,5.6L5,7L6.4,4.5L5,2L7.5,3.4L10,2L8.6,4.5L10,7L7.5,5.6M19.5,15.4L22,14L20.6,16.5L22,19L19.5,17.6L17,19L18.4,16.5L17,14L19.5,15.4M22,2L20.6,4.5L22,7L19.5,5.6L17,7L18.4,4.5L17,2L19.5,3.4L22,2M13.34,12.78L15.78,10.34L13.66,8.22L11.22,10.66L13.34,12.78M14.37,7.29L16.71,9.63C17.1,10 17.1,10.65 16.71,11.04L5.04,22.71C4.65,23.1 4,23.1 3.63,22.71L1.29,20.37C0.9,20 0.9,19.35 1.29,18.96L12.96,7.29C13.35,6.9 14,6.9 14.37,7.29Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_custom_selector.xml b/res/drawable/ic_ts_makeup_custom_selector.xml
index eecc2c7ce..6f9fff2b5 100644
--- a/res/drawable/ic_ts_makeup_custom_selector.xml
+++ b/res/drawable/ic_ts_makeup_custom_selector.xml
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_custom_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_custom" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7
+9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_1_selector.xml b/res/drawable/ic_ts_makeup_level_1_selector.xml
index 38e9193ab..2cd12afce 100644
--- a/res/drawable/ic_ts_makeup_level_1_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_1_selector.xml
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_1_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_level_1" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm11 10h2V5h-4v2h2v8zm7-14H7c-1.1 0-2 .9-2
+2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_2_selector.xml b/res/drawable/ic_ts_makeup_level_2_selector.xml
index 76d40bd88..4f8d2611b 100644
--- a/res/drawable/ic_ts_makeup_level_2_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_2_selector.xml
@@ -1,22 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_2_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_level_2" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14zm-4-4h-4v-2h2c1.1 0 2-.89
+2-2V7c0-1.11-.9-2-2-2h-4v2h4v2h-2c-1.1 0-2 .89-2 2v4h6v-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_3_selector.xml b/res/drawable/ic_ts_makeup_level_3_selector.xml
index e26ecdfa5..6a2c0d34e 100644
--- a/res/drawable/ic_ts_makeup_level_3_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_3_selector.xml
@@ -1,22 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_3_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_level_3" />
-</selector>
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 1H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0
+16H7V3h14v14zM3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm14 8v-1.5c0-.83-.67-1.5-1.5-1.5
+.83 0 1.5-.67 1.5-1.5V7c0-1.11-.9-2-2-2h-4v2h4v2h-2v2h2v2h-4v2h4c1.1 0 2-.89
+2-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_off_selector.xml b/res/drawable/ic_ts_makeup_level_off_selector.xml
index e1939673a..76c9d411a 100644
--- a/res/drawable/ic_ts_makeup_level_off_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_off_selector.xml
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_off_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_level_off" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_off.xml b/res/drawable/ic_ts_makeup_off.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_off.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_on.xml b/res/drawable/ic_ts_makeup_on.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_on.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_whiten_selector.xml b/res/drawable/ic_ts_makeup_whiten_selector.xml
index f1284b604..e2228fb62 100644
--- a/res/drawable/ic_ts_makeup_whiten_selector.xml
+++ b/res/drawable/ic_ts_makeup_whiten_selector.xml
@@ -1,22 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014,2015 Thundersoft Corporation
- All rights Reserved
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_whiten_selected" />
- <item android:drawable="@drawable/ic_ts_makeup_whiten" />
-</selector>
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_unmuted_button.xml b/res/drawable/ic_unmuted_button.xml
new file mode 100644
index 000000000..cb64ba3af
--- /dev/null
+++ b/res/drawable/ic_unmuted_button.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3
+3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6
+6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_videocam_white_24dp.xml b/res/drawable/ic_videocam_white_24dp.xml
new file mode 100644
index 000000000..1f48b9b5c
--- /dev/null
+++ b/res/drawable/ic_videocam_white_24dp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55 .45 1 1 1h12c.55 0 1-.45
+1-1v-3.5l4 4v-11l-4 4z" />
+</vector>
diff --git a/res/drawable/one_ui_shutter_1.png b/res/drawable/one_ui_shutter_1.png
deleted file mode 100644
index 46771e0cc..000000000
--- a/res/drawable/one_ui_shutter_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_2.png b/res/drawable/one_ui_shutter_2.png
deleted file mode 100644
index 07e1f72de..000000000
--- a/res/drawable/one_ui_shutter_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_3.png b/res/drawable/one_ui_shutter_3.png
deleted file mode 100644
index 503135797..000000000
--- a/res/drawable/one_ui_shutter_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_4.png b/res/drawable/one_ui_shutter_4.png
deleted file mode 100644
index 9d3f565af..000000000
--- a/res/drawable/one_ui_shutter_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_5.png b/res/drawable/one_ui_shutter_5.png
deleted file mode 100644
index df6ccd79f..000000000
--- a/res/drawable/one_ui_shutter_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_6.png b/res/drawable/one_ui_shutter_6.png
deleted file mode 100644
index 5165ef2c5..000000000
--- a/res/drawable/one_ui_shutter_6.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_anim.xml b/res/drawable/one_ui_shutter_anim.xml
deleted file mode 100644
index 980b9adad..000000000
--- a/res/drawable/one_ui_shutter_anim.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shutter_button_pressed"
- android:oneshot="true" >
-
- <item
- android:drawable="@drawable/photo_capture"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_6"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_5"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_4"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_3"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_2"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_1"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_2"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_3"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_4"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_5"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_6"
- android:duration="16"/>
- <item
- android:drawable="@drawable/photo_capture"
- android:duration="16"/>
-</animation-list>
diff --git a/res/drawable/photo_capture.png b/res/drawable/photo_capture.png
deleted file mode 100644
index 89cdb9a8f..000000000
--- a/res/drawable/photo_capture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/pick_the_best_photo.xml b/res/drawable/pick_the_best_photo.xml
new file mode 100644
index 000000000..b5b949fa3
--- /dev/null
+++ b/res/drawable/pick_the_best_photo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 16V4c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h12c1.1 0 2-.9
+2-2zm-11-4l2.03 2.71L16 11l4 5H8l3-4zM2 6v14c0 1.1 .9 2 2 2h14v-2H4V6H2z" />
+</vector>
diff --git a/res/drawable/pick_the_best_photo_selected.xml b/res/drawable/pick_the_best_photo_selected.xml
new file mode 100644
index 000000000..150583269
--- /dev/null
+++ b/res/drawable/pick_the_best_photo_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46
+4.73L5.82 21z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/pick_the_best_photo_unselected.xml b/res/drawable/pick_the_best_photo_unselected.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/pick_the_best_photo_unselected.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/remaining_sheets.xml b/res/drawable/remaining_sheets.xml
new file mode 100644
index 000000000..beaeb8d33
--- /dev/null
+++ b/res/drawable/remaining_sheets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z" />
+</vector>
diff --git a/res/drawable/shutter_button_anim.xml b/res/drawable/shutter_button_anim.xml
deleted file mode 100644
index 914977244..000000000
--- a/res/drawable/shutter_button_anim.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shutter_button_pressed"
- android:oneshot="true" >
-
- <item
- android:drawable="@drawable/shutter_button_0"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_1"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_2"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_3"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_4"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_5"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_6"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_5"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_4"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_3"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_2"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_1"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_0"
- android:duration="33"/>
-
-</animation-list>
diff --git a/res/drawable/shutter_button_normal.xml b/res/drawable/shutter_button_normal.xml
new file mode 100644
index 000000000..621922c37
--- /dev/null
+++ b/res/drawable/shutter_button_normal.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/photo"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_pressed.xml b/res/drawable/shutter_button_pressed.xml
new file mode 100644
index 000000000..98d290ff9
--- /dev/null
+++ b/res/drawable/shutter_button_pressed.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/photo"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_stop.xml b/res/drawable/shutter_button_stop.xml
new file mode 100644
index 000000000..5d23f2578
--- /dev/null
+++ b/res/drawable/shutter_button_stop.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/pano_stop"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video.xml b/res/drawable/shutter_button_video.xml
new file mode 100644
index 000000000..3fb897733
--- /dev/null
+++ b/res/drawable/shutter_button_video.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/video"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video_dim.xml b/res/drawable/shutter_button_video_dim.xml
new file mode 100644
index 000000000..5e5e35eaa
--- /dev/null
+++ b/res/drawable/shutter_button_video_dim.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/video"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video_stop.xml b/res/drawable/shutter_button_video_stop.xml
new file mode 100644
index 000000000..f239f485a
--- /dev/null
+++ b/res/drawable/shutter_button_video_stop.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/video_stop"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_panorama.xml b/res/drawable/shutter_panorama.xml
new file mode 100644
index 000000000..b5dfe21e1
--- /dev/null
+++ b/res/drawable/shutter_panorama.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/pano"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_panorama_dim.xml b/res/drawable/shutter_panorama_dim.xml
new file mode 100644
index 000000000..49845b39b
--- /dev/null
+++ b/res/drawable/shutter_panorama_dim.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/pano"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/video_capture.png b/res/drawable/video_capture.png
deleted file mode 100644
index f0c7c2289..000000000
--- a/res/drawable/video_capture.png
+++ /dev/null
Binary files differ