summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjrizzoli <joey@cyanogenmoditalia.it>2016-01-21 16:42:34 +0100
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 22:00:38 +0200
commitcea7526c70d3e77c79a1028a9c036aca7e38af09 (patch)
treeecdfe7cb63d20d93a33b3975988b07c990068c6b /res
parent7b7c3f3c08b733fdc09f166ec864c5c22aee2db3 (diff)
downloadandroid_packages_apps_Snap-cea7526c70d3e77c79a1028a9c036aca7e38af09.tar.gz
android_packages_apps_Snap-cea7526c70d3e77c79a1028a9c036aca7e38af09.tar.bz2
android_packages_apps_Snap-cea7526c70d3e77c79a1028a9c036aca7e38af09.zip
Snap: Add icons to all scene modes
Change-Id: Ie34f455460eb205de12c24be10a361e380db761f Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
Diffstat (limited to 'res')
-rw-r--r--res/drawable/ic_scene_mode_action.xml19
-rw-r--r--res/drawable/ic_scene_mode_entry_antimotionblur.xml27
-rw-r--r--res/drawable/ic_scene_mode_entry_aqua.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_ar.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_baby.xml36
-rw-r--r--res/drawable/ic_scene_mode_entry_backgroundblur.xml40
-rw-r--r--res/drawable/ic_scene_mode_entry_backlightportrait.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_barcode.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_beauty.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_cine.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_closeup.xml20
-rw-r--r--res/drawable/ic_scene_mode_entry_dark.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_dish.xml16
-rw-r--r--res/drawable/ic_scene_mode_entry_document.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_duskdawn.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_fallcolor.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_fireworks.xml19
-rw-r--r--res/drawable/ic_scene_mode_entry_handheldtwilight.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_highsensitivity.xml20
-rw-r--r--res/drawable/ic_scene_mode_entry_indoor.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_macro.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_mix_illuminant.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_mood.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_night.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_nightindoor.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_nightportrait.xml16
-rw-r--r--res/drawable/ic_scene_mode_entry_oldfilm.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_spotlight.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_steadyphoto.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_supernight.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_sweepstitch.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_text.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_theatre.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_whiteboard.xml15
-rw-r--r--res/drawable/ic_scene_mode_party.xml23
-rw-r--r--res/drawable/ic_scene_mode_pet.xml36
-rw-r--r--res/drawable/ic_scene_softskin.xml20
-rw-r--r--res/values/arrays.xml53
38 files changed, 749 insertions, 7 deletions
diff --git a/res/drawable/ic_scene_mode_action.xml b/res/drawable/ic_scene_mode_action.xml
new file mode 100644
index 000000000..7ef3aa4e4
--- /dev/null
+++ b/res/drawable/ic_scene_mode_action.xml
@@ -0,0 +1,19 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.49,5.48 C14.59,5.48,15.49,4.58,15.49,3.48 S14.59,1.48,13.49,1.48
+S11.49,2.38,11.49,3.48 S12.39,5.48,13.49,5.48 Z M9.89,19.38 L10.89,14.98
+L12.99,16.98 L12.99,22.98 L14.99,22.98 L14.99,15.48 L12.89,13.48 L13.49,10.48
+C14.79,11.98,16.79,12.98,18.99,12.98 L18.99,10.98
+C17.09,10.98,15.49,9.98,14.69,8.58 L13.69,6.98 C13.29,6.38,12.69,5.98,11.99,5.98
+C11.69,5.98,11.49,6.08,11.19,6.08 L5.99,8.28 L5.99,12.98 L7.99,12.98 L7.99,9.58
+L9.79,8.88 L8.19,16.98 L3.29,15.98 L2.89,17.98 L9.89,19.38 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_antimotionblur.xml b/res/drawable/ic_scene_mode_entry_antimotionblur.xml
new file mode 100644
index 000000000..a3954dd19
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_antimotionblur.xml
@@ -0,0 +1,27 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M5,17.5 C5.83,17.5,6.5,16.83,6.5,16 S5.83,14.5,5,14.5 S3.5,15.17,3.5,16
+S4.17,17.5,5,17.5 Z M9,13 C9.55,13,10,12.55,10,12 S9.55,11,9,11 S8,11.45,8,12
+S8.45,13,9,13 Z M9,9 C9.55,9,10,8.55,10,8 S9.55,7,9,7 S8,7.45,8,8 S8.45,9,9,9 Z
+M3,21 L21,21 L21,19 L3,19 L3,21 Z M5,9.5 C5.83,9.5,6.5,8.83,6.5,8
+S5.83,6.5,5,6.5 S3.5,7.17,3.5,8 S4.17,9.5,5,9.5 Z M5,13.5
+C5.83,13.5,6.5,12.83,6.5,12 S5.83,10.5,5,10.5 S3.5,11.17,3.5,12
+S4.17,13.5,5,13.5 Z M9,17 C9.55,17,10,16.55,10,16 S9.55,15,9,15 S8,15.45,8,16
+S8.45,17,9,17 Z M17,16.5 C17.28,16.5,17.5,16.28,17.5,16 S17.28,15.5,17,15.5
+S16.5,15.72,16.5,16 S16.72,16.5,17,16.5 Z M3,3 L3,5 L21,5 L21,3 L3,3 Z M17,8.5
+C17.28,8.5,17.5,8.28,17.5,8 S17.28,7.5,17,7.5 S16.5,7.72,16.5,8
+S16.72,8.5,17,8.5 Z M17,12.5 C17.28,12.5,17.5,12.28,17.5,12 S17.28,11.5,17,11.5
+S16.5,11.72,16.5,12 S16.72,12.5,17,12.5 Z M13,9 C13.55,9,14,8.55,14,8
+S13.55,7,13,7 S12,7.45,12,8 S12.45,9,13,9 Z M13,13 C13.55,13,14,12.55,14,12
+S13.55,11,13,11 S12,11.45,12,12 S12.45,13,13,13 Z M13,17
+C13.55,17,14,16.55,14,16 S13.55,15,13,15 S12,15.45,12,16 S12.45,17,13,17 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_aqua.xml b/res/drawable/ic_scene_mode_entry_aqua.xml
new file mode 100644
index 000000000..3d32ea1bc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_aqua.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="M24,0 L0,0 L0,24 L24,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.66,7.93 L12,2.27 L6.34,7.93 C3.22,11.05,3.22,16.12,6.34,19.24
+C7.9,20.8,9.95,21.58,12,21.58 C14.05,21.58,16.1,20.8,17.66,19.24
+C20.78,16.12,20.78,11.05,17.66,7.93 Z M12,19.59
+C10.4,19.59,8.89,18.97,7.76,17.83 C6.62,16.69,6,15.19,6,13.59
+S6.62,10.48,7.76,9.35 L12,5.1 L12,19.59 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_ar.xml b/res/drawable/ic_scene_mode_entry_ar.xml
new file mode 100644
index 000000000..b294dabbd
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_ar.xml
@@ -0,0 +1,25 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11,4.07 L11,2.05 C8.99,2.25,7.16,3.05,5.68,4.26 L7.1,5.69
+C8.21,4.83,9.54,4.25,11,4.07 Z M18.32,4.26 C16.84,3.05,15.01,2.25,13,2.05
+L13,4.07 C14.46,4.25,15.79,4.83,16.9,5.69 L18.32,4.26 Z M19.93,11 L21.95,11
+C21.75,8.99,20.95,7.16,19.74,5.68 L18.31,7.1 C19.17,8.21,19.75,9.54,19.93,11 Z
+M5.69,7.1 L4.26,5.68 C3.05,7.16,2.25,8.99,2.05,11 L4.07,11
+C4.25,9.54,4.83,8.21,5.69,7.1 Z M4.07,13 L2.05,13
+C2.25,15.01,3.05,16.84,4.26,18.32 L5.69,16.89 C4.83,15.79,4.25,14.46,4.07,13 Z
+M15,12 C15,10.34,13.66,9,12,9 S9,10.34,9,12 S10.34,15,12,15 S15,13.66,15,12 Z
+M18.31,16.9 L19.74,18.33 C20.95,16.85,21.75,15.01,21.95,13.01 L19.93,13.01
+C19.75,14.46,19.17,15.79,18.31,16.9 Z M13,19.93 L13,21.95
+C15.01,21.75,16.84,20.95,18.32,19.74 L16.89,18.31
+C15.79,19.17,14.46,19.75,13,19.93 Z M5.68,19.74 C7.16,20.95,9,21.75,11,21.95
+L11,19.93 C9.54,19.75,8.21,19.17,7.1,18.31 L5.68,19.74 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_baby.xml b/res/drawable/ic_scene_mode_entry_baby.xml
new file mode 100644
index 000000000..ac6dbfbc7
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_baby.xml
@@ -0,0 +1,36 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14.5,9.25 C15.1904,9.25,15.75,9.80964,15.75,10.5
+C15.75,11.1904,15.1904,11.75,14.5,11.75 C13.8096,11.75,13.25,11.1904,13.25,10.5
+C13.25,9.80964,13.8096,9.25,14.5,9.25 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9.5,9.25 C10.1904,9.25,10.75,9.80964,10.75,10.5
+C10.75,11.1904,10.1904,11.75,9.5,11.75 C8.80964,11.75,8.25,11.1904,8.25,10.5
+C8.25,9.80964,8.80964,9.25,9.5,9.25 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22.94,12.66 C22.98,12.45,23,12.23,23,12 S22.98,11.55,22.94,11.34
+C22.69,9.83,21.58,8.6,20.13,8.17 C19.6,7.05,18.85,6.07,17.94,5.26
+C16.36,3.85,14.28,3,12,3 S7.64,3.85,6.06,5.26 C5.14,6.07,4.39,7.06,3.87,8.17
+C2.42,8.6,1.31,9.82,1.06,11.34 C1.02,11.55,1,11.77,1,12 S1.02,12.45,1.06,12.66
+C1.31,14.17,2.42,15.4,3.87,15.83 C4.39,16.94,5.14,17.92,6.04,18.72
+C7.62,20.14,9.71,21,12,21 S16.38,20.14,17.97,18.72
+C18.87,17.92,19.62,16.93,20.14,15.83 C21.58,15.4,22.69,14.18,22.94,12.66 Z
+M19,14 C18.9,14,18.81,13.98,18.71,13.97 C18.51,14.64,18.22,15.26,17.85,15.83
+C16.6,17.74,14.45,19,12,19 S7.4,17.74,6.15,15.83
+C5.78,15.26,5.49,14.64,5.29,13.97 C5.19,13.98,5.1,14,5,14 C3.9,14,3,13.1,3,12
+S3.9,10,5,10 C5.1,10,5.19,10.02,5.29,10.03 C5.49,9.36,5.78,8.74,6.15,8.17
+C7.4,6.26,9.55,5,12,5 S16.6,6.26,17.85,8.17 C18.22,8.74,18.51,9.36,18.71,10.03
+C18.81,10.02,18.9,10,19,10 C20.1,10,21,10.9,21,12 S20.1,14,19,14 Z M7.5,14
+C8.26,15.77,9.99,17,12,17 S15.74,15.77,16.5,14 L7.5,14 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_backgroundblur.xml b/res/drawable/ic_scene_mode_entry_backgroundblur.xml
new file mode 100644
index 000000000..85e07083c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_backgroundblur.xml
@@ -0,0 +1,40 @@
+<?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,13 C5.45,13,5,13.45,5,14 S5.45,15,6,15 S7,14.55,7,14 S6.55,13,6,13 Z M6,17
+C5.45,17,5,17.45,5,18 S5.45,19,6,19 S7,18.55,7,18 S6.55,17,6,17 Z M6,9
+C5.45,9,5,9.45,5,10 S5.45,11,6,11 S7,10.55,7,10 S6.55,9,6,9 Z M3,9.5
+C2.72,9.5,2.5,9.72,2.5,10 S2.72,10.5,3,10.5 S3.5,10.28,3.5,10 S3.28,9.5,3,9.5 Z
+M6,5 C5.45,5,5,5.45,5,6 S5.45,7,6,7 S7,6.55,7,6 S6.55,5,6,5 Z M21,10.5
+C21.28,10.5,21.5,10.28,21.5,10 S21.28,9.5,21,9.5 S20.5,9.72,20.5,10
+S20.72,10.5,21,10.5 Z M14,7 C14.55,7,15,6.55,15,6 S14.55,5,14,5 S13,5.45,13,6
+S13.45,7,14,7 Z M14,3.5 C14.28,3.5,14.5,3.28,14.5,3 S14.28,2.5,14,2.5
+S13.5,2.72,13.5,3 S13.72,3.5,14,3.5 Z M3,13.5 C2.72,13.5,2.5,13.72,2.5,14
+S2.72,14.5,3,14.5 S3.5,14.28,3.5,14 S3.28,13.5,3,13.5 Z M10,20.5
+C9.72,20.5,9.5,20.72,9.5,21 S9.72,21.5,10,21.5 S10.5,21.28,10.5,21
+S10.28,20.5,10,20.5 Z M10,3.5 C10.28,3.5,10.5,3.28,10.5,3 S10.28,2.5,10,2.5
+S9.5,2.72,9.5,3 S9.72,3.5,10,3.5 Z M10,7 C10.55,7,11,6.55,11,6 S10.55,5,10,5
+S9,5.45,9,6 S9.45,7,10,7 Z M10,12.5 C9.17,12.5,8.5,13.17,8.5,14
+S9.17,15.5,10,15.5 S11.5,14.83,11.5,14 S10.83,12.5,10,12.5 Z M18,13
+C17.45,13,17,13.45,17,14 S17.45,15,18,15 S19,14.55,19,14 S18.55,13,18,13 Z
+M18,17 C17.45,17,17,17.45,17,18 S17.45,19,18,19 S19,18.55,19,18 S18.55,17,18,17
+Z M18,9 C17.45,9,17,9.45,17,10 S17.45,11,18,11 S19,10.55,19,10 S18.55,9,18,9 Z
+M18,5 C17.45,5,17,5.45,17,6 S17.45,7,18,7 S19,6.55,19,6 S18.55,5,18,5 Z M21,13.5
+C20.72,13.5,20.5,13.72,20.5,14 S20.72,14.5,21,14.5 S21.5,14.28,21.5,14
+S21.28,13.5,21,13.5 Z M14,17 C13.45,17,13,17.45,13,18 S13.45,19,14,19
+S15,18.55,15,18 S14.55,17,14,17 Z M14,20.5 C13.72,20.5,13.5,20.72,13.5,21
+S13.72,21.5,14,21.5 S14.5,21.28,14.5,21 S14.28,20.5,14,20.5 Z M10,8.5
+C9.17,8.5,8.5,9.17,8.5,10 S9.17,11.5,10,11.5 S11.5,10.83,11.5,10
+S10.83,8.5,10,8.5 Z M10,17 C9.45,17,9,17.45,9,18 S9.45,19,10,19 S11,18.55,11,18
+S10.55,17,10,17 Z M14,12.5 C13.17,12.5,12.5,13.17,12.5,14 S13.17,15.5,14,15.5
+S15.5,14.83,15.5,14 S14.83,12.5,14,12.5 Z M14,8.5 C13.17,8.5,12.5,9.17,12.5,10
+S13.17,11.5,14,11.5 S15.5,10.83,15.5,10 S14.83,8.5,14,8.5 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_backlightportrait.xml b/res/drawable/ic_scene_mode_entry_backlightportrait.xml
new file mode 100644
index 000000000..46759eddc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_backlightportrait.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="M12,5.9 C13.16,5.9,14.1,6.84,14.1,8 S13.16,10.1,12,10.1 S9.9,9.16,9.9,8
+S10.84,5.9,12,5.9 M12,14.9 C14.97,14.9,18.1,16.36,18.1,17 L18.1,18.1 L5.9,18.1
+L5.9,17 C5.9,16.36,9.03,14.9,12,14.9 M12,4 C9.79,4,8,5.79,8,8 S9.79,12,12,12
+S16,10.21,16,8 S14.21,4,12,4 Z M12,13 C9.33,13,4,14.34,4,17 L4,20 L20,20 L20,17
+C20,14.34,14.67,13,12,13 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_barcode.xml b/res/drawable/ic_scene_mode_entry_barcode.xml
new file mode 100644
index 000000000..c71fa827f
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_barcode.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="M4,18 L7,18 L7,5 L4,5 L4,18 Z M18,5 L18,18 L21,18 L21,5 L18,5 Z M8,18 L17,18
+L17,5 L8,5 L8,18 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_beauty.xml b/res/drawable/ic_scene_mode_entry_beauty.xml
new file mode 100644
index 000000000..dfd0ece4e
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_beauty.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z M15.5,11 C16.33,11,17,10.33,17,9.5 S16.33,8,15.5,8
+S14,8.67,14,9.5 S14.67,11,15.5,11 Z M8.5,11 C9.33,11,10,10.33,10,9.5
+S9.33,8,8.5,8 S7,8.67,7,9.5 S7.67,11,8.5,11 Z M12,17.5
+C14.33,17.5,16.31,16.04,17.11,14 L6.89,14 C7.69,16.04,9.67,17.5,12,17.5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_cine.xml b/res/drawable/ic_scene_mode_entry_cine.xml
new file mode 100644
index 000000000..1aa822d69
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_cine.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="M18,3 L18,5 L16,5 L16,3 L8,3 L8,5 L6,5 L6,3 L4,3 L4,21 L6,21 L6,19 L8,19 L8,21
+L16,21 L16,19 L18,19 L18,21 L20,21 L20,3 L18,3 Z M8,17 L6,17 L6,15 L8,15 L8,17 Z
+M8,13 L6,13 L6,11 L8,11 L8,13 Z M8,9 L6,9 L6,7 L8,7 L8,9 Z M18,17 L16,17 L16,15
+L18,15 L18,17 Z M18,13 L16,13 L16,11 L18,11 L18,13 Z M18,9 L16,9 L16,7 L18,7
+L18,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_closeup.xml b/res/drawable/ic_scene_mode_entry_closeup.xml
new file mode 100644
index 000000000..b29be6ba8
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_closeup.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="M15.5,14 L14.71,14 L14.43,13.73 C15.41,12.59,16,11.11,16,9.5
+C16,5.91,13.09,3,9.5,3 S3,5.91,3,9.5 S5.91,16,9.5,16
+C11.11,16,12.59,15.41,13.73,14.43 L14,14.71 L14,15.5 L19,20.49 L20.49,19
+L15.5,14 Z M9.5,14 C7.01,14,5,11.99,5,9.5 S7.01,5,9.5,5 S14,7.01,14,9.5
+S11.99,14,9.5,14 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,10 L10,10 L10,12 L9,12 L9,10 L7,10 L7,9 L9,9 L9,7 L10,7 L10,9 L12,9 L12,10 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_dark.xml b/res/drawable/ic_scene_mode_entry_dark.xml
new file mode 100644
index 000000000..e3f956983
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_dark.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="M10,2 C8.18,2,6.47,2.5,5,3.35 C7.99,5.08,10,8.3,10,12 S7.99,18.92,5,20.65
+C6.47,21.5,8.18,22,10,22 C15.52,22,20,17.52,20,12 S15.52,2,10,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_dish.xml b/res/drawable/ic_scene_mode_entry_dish.xml
new file mode 100644
index 000000000..67faf5605
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_dish.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,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18,2.01 L6,2 C4.9,2,4,2.89,4,4 L4,20 C4,21.1,4.9,22,6,22 L18,22
+C19.1,22,20,21.1,20,20 L20,4 C20,2.89,19.1,2.01,18,2.01 Z M18,20 L6,20 L6,10.98
+L18,10.98 L18,20 Z M18,9 L6,9 L6,4 L18,4 L18,9 Z M8,5 L10,5 L10,8 L8,8 Z M8,12
+L10,12 L10,17 L8,17 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_document.xml b/res/drawable/ic_scene_mode_entry_document.xml
new file mode 100644
index 000000000..b28527fc7
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_document.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="M6,2 C4.9,2,4.01,2.9,4.01,4 L4,20 C4,21.1,4.89,22,5.99,22 L18,22
+C19.1,22,20,21.1,20,20 L20,8 L14,2 L6,2 Z M13,9 L13,3.5 L18.5,9 L13,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_duskdawn.xml b/res/drawable/ic_scene_mode_entry_duskdawn.xml
new file mode 100644
index 000000000..22247cc2d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_duskdawn.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20,15.31 L23.31,12 L20,8.69 L20,4 L15.31,4 L12,0.69 L8.69,4 L4,4 L4,8.69
+L0.69,12 L4,15.31 L4,20 L8.69,20 L12,23.31 L15.31,20 L20,20 L20,15.31 Z M12,18
+L12,6 C15.31,6,18,8.69,18,12 S15.31,18,12,18 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_fallcolor.xml b/res/drawable/ic_scene_mode_entry_fallcolor.xml
new file mode 100644
index 000000000..7f1c6d3ba
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_fallcolor.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14,6 L10.25,11 L13.1,14.8 L11.5,16 C9.81,13.75,7,10,7,10 L1,18 L23,18 L14,6 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_fireworks.xml b/res/drawable/ic_scene_mode_entry_fireworks.xml
new file mode 100644
index 000000000..5b0e9b355
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_fireworks.xml
@@ -0,0 +1,19 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7,11 L1,11 L1,13 L7,13 L7,11 Z M9.17,7.76 L7.05,5.64 L5.64,7.05 L7.76,9.17
+L9.17,7.76 Z M13,1 L11,1 L11,7 L13,7 L13,1 Z M18.36,7.05 L16.95,5.64 L14.83,7.76
+L16.24,9.17 L18.36,7.05 Z M17,11 L17,13 L23,13 L23,11 L17,11 Z M12,9
+C10.34,9,9,10.34,9,12 S10.34,15,12,15 S15,13.66,15,12 S13.66,9,12,9 Z
+M14.83,16.24 L16.95,18.36 L18.36,16.95 L16.24,14.83 L14.83,16.24 Z M5.64,16.95
+L7.05,18.36 L9.17,16.24 L7.76,14.83 L5.64,16.95 Z M11,23 L13,23 L13,17 L11,17
+L11,23 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_handheldtwilight.xml b/res/drawable/ic_scene_mode_entry_handheldtwilight.xml
new file mode 100644
index 000000000..f169e2741
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_handheldtwilight.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="M9,2 C7.95,2,6.95,2.16,6,2.46 C10.06,3.73,13,7.52,13,12
+C13,16.48,10.06,20.27,6,21.54 C6.95,21.84,7.95,22,9,22 C14.52,22,19,17.52,19,12
+S14.52,2,9,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_highsensitivity.xml b/res/drawable/ic_scene_mode_entry_highsensitivity.xml
new file mode 100644
index 000000000..0ee2e7b23
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_highsensitivity.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9.4,10.5 L14.17,2.24 C13.47,2.09,12.75,2,12,2 C9.6,2,7.4,2.85,5.68,4.25
+L9.34,10.6 L9.4,10.5 Z M21.54,9 C20.62,6.08,18.39,3.74,15.54,2.66 L11.88,9
+L21.54,9 Z M21.8,10 L14.31,10 L14.6,10.5 L19.36,18.75 C21,16.97,22,14.61,22,12
+C22,11.31,21.93,10.65,21.8,10 Z M8.54,12 L4.64,5.25 C3.01,7.03,2,9.39,2,12
+C2,12.69,2.07,13.35,2.2,14 L9.69,14 L8.54,12 Z M2.46,15
+C3.38,17.92,5.61,20.26,8.46,21.34 L12.12,15 L2.46,15 Z M13.73,15 L9.83,21.76
+C10.53,21.91,11.25,22,12,22 C14.4,22,16.6,21.15,18.32,19.75 L14.66,13.4
+L13.73,15 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_indoor.xml b/res/drawable/ic_scene_mode_entry_indoor.xml
new file mode 100644
index 000000000..42a15a01a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_indoor.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="M21,10 C19.9,10,19,10.9,19,12 L19,15 L5,15 L5,12 C5,10.9,4.1,10,3,10
+S1,10.9,1,12 L1,17 C1,18.1,1.9,19,3,19 L21,19 C22.1,19,23,18.1,23,17 L23,12
+C23,10.9,22.1,10,21,10 Z M18,5 L6,5 C4.9,5,4,5.9,4,7 L4,9.15
+C5.16,9.56,6,10.66,6,11.97 L6,14 L18,14 L18,11.97 C18,10.67,18.84,9.57,20,9.15
+L20,7 C20,5.9,19.1,5,18,5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_macro.xml b/res/drawable/ic_scene_mode_entry_macro.xml
new file mode 100644
index 000000000..2ea0e1d54
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_macro.xml
@@ -0,0 +1,25 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18.7,12.4 C18.42,12.24,18.13,12.11,17.84,12 C18.13,11.89,18.42,11.76,18.7,11.6
+C20.62,10.49,21.69,8.48,21.7,6.41 C19.91,5.38,17.63,5.3,15.7,6.41
+C15.42,6.57,15.16,6.76,14.92,6.95 C14.97,6.64,15,6.32,15,6
+C15,3.78,13.79,1.85,12,0.81 C10.21,1.85,9,3.78,9,6 C9,6.32,9.03,6.64,9.08,6.95
+C8.84,6.75,8.58,6.56,8.3,6.4 C6.38,5.29,4.1,5.37,2.3,6.4
+C2.3,8.47,3.37,10.48,5.3,11.59 C5.58,11.75,5.87,11.88,6.16,11.99
+C5.87,12.1,5.58,12.23,5.3,12.39 C3.38,13.5,2.31,15.51,2.3,17.58
+C4.09,18.61,6.37,18.69,8.3,17.58 C8.58,17.42,8.84,17.23,9.08,17.04
+C9.03,17.36,9,17.68,9,18 C9,20.22,10.21,22.15,12,23.19
+C13.79,22.15,15,20.22,15,18 C15,17.68,14.97,17.36,14.92,17.05
+C15.16,17.25,15.42,17.43,15.7,17.59 C17.62,18.7,19.9,18.62,21.7,17.59
+C21.69,15.52,20.62,13.51,18.7,12.4 Z M12,16 C9.79,16,8,14.21,8,12 S9.79,8,12,8
+S16,9.79,16,12 S14.21,16,12,16 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_mix_illuminant.xml b/res/drawable/ic_scene_mode_entry_mix_illuminant.xml
new file mode 100644
index 000000000..642de6246
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_mix_illuminant.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:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M5,14.5 L19,14.5 L19,8.5 L5,8.5 L5,14.5 Z M11,0.55 L11,3.5 L13,3.5 L13,0.55
+L11,0.55 Z M19.04,3.05 L17.25,4.84 L18.66,6.25 L20.46,4.46 L19.04,3.05 Z
+M13,22.45 L13,19.5 L11,19.5 L11,22.45 L13,22.45 Z M20.45,18.54 L18.65,16.75
+L17.24,18.16 L19.03,19.96 L20.45,18.54 Z M3.55,4.46 L5.34,6.25 L6.75,4.84
+L4.96,3.05 L3.55,4.46 Z M4.96,19.95 L6.75,18.15 L5.34,16.74 L3.55,18.53
+L4.96,19.95 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_mood.xml b/res/drawable/ic_scene_mode_entry_mood.xml
new file mode 100644
index 000000000..6ec74def6
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_mood.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:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z M15.5,11 C16.33,11,17,10.33,17,9.5 S16.33,8,15.5,8
+S14,8.67,14,9.5 S14.67,11,15.5,11 Z M8.5,11 C9.33,11,10,10.33,10,9.5
+S9.33,8,8.5,8 S7,8.67,7,9.5 S7.67,11,8.5,11 Z M12,14
+C9.67,14,7.69,15.46,6.89,17.5 L17.11,17.5 C16.31,15.46,14.33,14,12,14 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_night.xml b/res/drawable/ic_scene_mode_entry_night.xml
new file mode 100644
index 000000000..e3f956983
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_night.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="M10,2 C8.18,2,6.47,2.5,5,3.35 C7.99,5.08,10,8.3,10,12 S7.99,18.92,5,20.65
+C6.47,21.5,8.18,22,10,22 C15.52,22,20,17.52,20,12 S15.52,2,10,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_nightindoor.xml b/res/drawable/ic_scene_mode_entry_nightindoor.xml
new file mode 100644
index 000000000..42a15a01a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_nightindoor.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="M21,10 C19.9,10,19,10.9,19,12 L19,15 L5,15 L5,12 C5,10.9,4.1,10,3,10
+S1,10.9,1,12 L1,17 C1,18.1,1.9,19,3,19 L21,19 C22.1,19,23,18.1,23,17 L23,12
+C23,10.9,22.1,10,21,10 Z M18,5 L6,5 C4.9,5,4,5.9,4,7 L4,9.15
+C5.16,9.56,6,10.66,6,11.97 L6,14 L18,14 L18,11.97 C18,10.67,18.84,9.57,20,9.15
+L20,7 C20,5.9,19.1,5,18,5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_nightportrait.xml b/res/drawable/ic_scene_mode_entry_nightportrait.xml
new file mode 100644
index 000000000..17a6484ec
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_nightportrait.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="M3,5 L3,19 C3,20.1,3.89,21,5,21 L19,21 C20.1,21,21,20.1,21,19 L21,5
+C21,3.9,20.1,3,19,3 L5,3 C3.89,3,3,3.9,3,5 Z M15,9 C15,10.66,13.66,12,12,12
+S9,10.66,9,9 S10.34,6,12,6 S15,7.34,15,9 Z M6,17 C6,15,10,13.9,12,13.9
+S18,15,18,17 L18,18 L6,18 L6,17 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_oldfilm.xml b/res/drawable/ic_scene_mode_entry_oldfilm.xml
new file mode 100644
index 000000000..1aa822d69
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_oldfilm.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="M18,3 L18,5 L16,5 L16,3 L8,3 L8,5 L6,5 L6,3 L4,3 L4,21 L6,21 L6,19 L8,19 L8,21
+L16,21 L16,19 L18,19 L18,21 L20,21 L20,3 L18,3 Z M8,17 L6,17 L6,15 L8,15 L8,17 Z
+M8,13 L6,13 L6,11 L8,11 L8,13 Z M8,9 L6,9 L6,7 L8,7 L8,9 Z M18,17 L16,17 L16,15
+L18,15 L18,17 Z M18,13 L16,13 L16,11 L18,11 L18,13 Z M18,9 L16,9 L16,7 L18,7
+L18,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_spotlight.xml b/res/drawable/ic_scene_mode_entry_spotlight.xml
new file mode 100644
index 000000000..9103dffcc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_spotlight.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="M6,14 L9,17 L9,22 L15,22 L15,17 L18,14 L18,9 L6,9 Z M11,2 L13,2 L13,5 L11,5 Z
+M3.5,5.875 L4.914,4.46 L7.034,6.582 L5.62,7.997 Z M16.96,6.585 L19.083,4.465
+L20.497,5.879 L18.375,8 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_steadyphoto.xml b/res/drawable/ic_scene_mode_entry_steadyphoto.xml
new file mode 100644
index 000000000..e5f7b627a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_steadyphoto.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19,3 L5,3 C3.9,3,3,3.9,3,5 L3,19 C3,20.1,3.9,21,5,21 L19,21
+C20.1,21,21,20.1,21,19 L21,5 C21,3.9,20.1,3,19,3 Z M19,19 L5,19 L5,5 L19,5
+L19,19 Z M13.96,12.29 L11.21,15.83 L9.25,13.47 L6.5,17 L17.5,17 L13.96,12.29 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_supernight.xml b/res/drawable/ic_scene_mode_entry_supernight.xml
new file mode 100644
index 000000000..8460f64fd
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_supernight.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18,4 C15.91,4,13.89,4.32,12,4.92 C20.11,7.47,26,15.05,26,24
+C26,32.95,20.11,40.53,12,43.08 C13.89,43.67,15.91,44,18,44
+C29.05,44,38,35.05,38,24 S29.05,4,18,4 Z" />
+ <path
+ android:pathData="M0,0 L48,0 L48,48 L0,48 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_sweepstitch.xml b/res/drawable/ic_scene_mode_entry_sweepstitch.xml
new file mode 100644
index 000000000..5a454596e
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_sweepstitch.xml
@@ -0,0 +1,25 @@
+<?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="M4.59,6.89 C5.29,6.18,5.99,5.54,6.3,5.67 C6.8,5.87,6.3,6.7,6,7.19
+C5.75,7.61,3.14,11.08,3.14,13.5 C3.14,14.78,3.62,15.84,4.48,16.48
+C5.23,17.04,6.22,17.21,7.12,16.94 C8.19,16.63,9.07,15.54,10.18,14.17
+C11.39,12.68,13.01,10.73,14.26,10.73 C15.89,10.73,15.91,11.74,16.02,12.52
+C12.24,13.16,10.64,16.19,10.64,17.89 C10.64,19.59,12.08,20.98,13.85,20.98
+C15.48,20.98,18.14,19.65,18.54,14.88 L21,14.88 L21,12.38 L18.53,12.38
+C18.38,10.73,17.44,8.18,14.5,8.18 C12.25,8.18,10.32,10.09,9.56,11.02
+C8.98,11.75,7.5,13.5,7.27,13.74 C7.02,14.04,6.59,14.58,6.16,14.58
+C5.71,14.58,5.44,13.75,5.8,12.66 C6.15,11.57,7.2,9.8,7.65,9.14
+C8.43,8,8.95,7.22,8.95,5.86 C8.95,3.69,7.31,3,6.44,3 C5.12,3,3.97,4,3.72,4.25
+C3.36,4.61,3.06,4.91,2.84,5.18 L4.59,6.89 Z M13.88,18.55
+C13.57,18.55,13.14,18.29,13.14,17.83 C13.14,17.23,13.87,15.63,16.01,15.07
+C15.71,17.76,14.58,18.55,13.88,18.55 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_text.xml b/res/drawable/ic_scene_mode_entry_text.xml
new file mode 100644
index 000000000..1117908be
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_text.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9,4 L9,7 L14,7 L14,19 L17,19 L17,7 L22,7 L22,4 L9,4 Z M3,12 L6,12 L6,19 L9,19
+L9,12 L12,12 L12,9 L3,9 L3,12 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_theatre.xml b/res/drawable/ic_scene_mode_entry_theatre.xml
new file mode 100644
index 000000000..1eec0ac52
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_theatre.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="M4,18 L4,21 L7,21 L7,18 L17,18 L17,21 L20,21 L20,15 L4,15 Z M19,10 L22,10 L22,13
+L19,13 Z M2,10 L5,10 L5,13 L2,13 Z M17,13 L7,13 L7,5 C7,3.9,7.9,3,9,3 L15,3
+C16.1,3,17,3.9,17,5 L17,13 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_whiteboard.xml b/res/drawable/ic_scene_mode_entry_whiteboard.xml
new file mode 100644
index 000000000..895035f6c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_whiteboard.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19,7 L5,7 C3.9,7,3,7.9,3,9 L3,15 C3,16.1,3.9,17,5,17 L19,17
+C20.1,17,21,16.1,21,15 L21,9 C21,7.9,20.1,7,19,7 Z M19,15 L5,15 L5,9 L19,9
+L19,15 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_party.xml b/res/drawable/ic_scene_mode_party.xml
new file mode 100644
index 000000000..47fded30c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_party.xml
@@ -0,0 +1,23 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,6 C13.11,6,14,5.1,14,4 C14,3.62,13.9,3.27,13.71,2.97 L12,0 L10.29,2.97
+C10.1,3.27,10,3.62,10,4 C10,5.1,10.9,6,12,6 Z M16.6,15.99 L15.53,14.92
+L14.45,15.99 C13.15,17.29,10.87,17.3,9.56,15.99 L8.49,14.92 L7.4,15.99
+C6.75,16.64,5.88,17,4.96,17 C4.23,17,3.56,16.77,3,16.39 L3,21
+C3,21.55,3.45,22,4,22 L20,22 C20.55,22,21,21.55,21,21 L21,16.39
+C20.44,16.77,19.77,17,19.04,17 C18.12,17,17.25,16.64,16.6,15.99 Z M18,9 L13,9
+L13,7 L11,7 L11,9 L6,9 C4.34,9,3,10.34,3,12 L3,13.54
+C3,14.62,3.88,15.5,4.96,15.5 C5.48,15.5,5.98,15.3,6.34,14.93 L8.48,12.8
+L10.61,14.93 C11.35,15.67,12.64,15.67,13.38,14.93 L15.52,12.8 L17.65,14.93
+C18.02,15.3,18.51,15.5,19.03,15.5 C20.11,15.5,20.99,14.62,20.99,13.54 L20.99,12
+C21,10.34,19.66,9,18,9 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_pet.xml b/res/drawable/ic_scene_mode_pet.xml
new file mode 100644
index 000000000..a3bcb5a70
--- /dev/null
+++ b/res/drawable/ic_scene_mode_pet.xml
@@ -0,0 +1,36 @@
+<?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="M4.5,7 C5.88071,7,7,8.11929,7,9.5 C7,10.8807,5.88071,12,4.5,12
+C3.11929,12,2,10.8807,2,9.5 C2,8.11929,3.11929,7,4.5,7 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9,3 C10.3807,3,11.5,4.11929,11.5,5.5 C11.5,6.88071,10.3807,8,9,8
+C7.61929,8,6.5,6.88071,6.5,5.5 C6.5,4.11929,7.61929,3,9,3 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15,3 C16.3807,3,17.5,4.11929,17.5,5.5 C17.5,6.88071,16.3807,8,15,8
+C13.6193,8,12.5,6.88071,12.5,5.5 C12.5,4.11929,13.6193,3,15,3 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19.5,7 C20.8807,7,22,8.11929,22,9.5 C22,10.8807,20.8807,12,19.5,12
+C18.1193,12,17,10.8807,17,9.5 C17,8.11929,18.1193,7,19.5,7 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.34,14.86 C16.47,13.84,15.74,12.97,14.86,11.95
+C14.4,11.41,13.81,10.87,13.11,10.63 C13,10.59,12.89,10.56,12.78,10.54
+C12.53,10.5,12.26,10.5,12,10.5 S11.47,10.5,11.21,10.55
+C11.1,10.57,10.99,10.6,10.88,10.64 C10.18,10.88,9.6,11.42,9.13,11.96
+C8.26,12.98,7.53,13.85,6.65,14.87 C5.34,16.18,3.73,17.63,4.03,19.66
+C4.32,20.68,5.05,21.69,6.36,21.98 C7.09,22.13,9.42,21.54,11.9,21.54 L12.08,21.54
+C14.56,21.54,16.89,22.12,17.62,21.98 C18.93,21.69,19.66,20.67,19.95,19.66
+C20.26,17.62,18.65,16.17,17.34,14.86 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_softskin.xml b/res/drawable/ic_scene_softskin.xml
new file mode 100644
index 000000000..916a6f55d
--- /dev/null
+++ b/res/drawable/ic_scene_softskin.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="M9,11.75 C8.31,11.75,7.75,12.31,7.75,13 S8.31,14.25,9,14.25
+S10.25,13.69,10.25,13 S9.69,11.75,9,11.75 Z M15,11.75
+C14.31,11.75,13.75,12.31,13.75,13 S14.31,14.25,15,14.25 S16.25,13.69,16.25,13
+S15.69,11.75,15,11.75 Z M12,2 C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12
+S17.52,2,12,2 Z M12,20 C7.59,20,4,16.41,4,12 C4,11.71,4.02,11.42,4.05,11.14
+C6.41,10.09,8.28,8.16,9.26,5.77 C11.07,8.33,14.05,10,17.42,10
+C18.2,10,18.95,9.91,19.67,9.74 C19.88,10.45,20,11.21,20,12
+C20,16.41,16.41,20,12,20 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a8099c0e1..734a297be 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -417,16 +417,55 @@
<item>@drawable/ic_scene_mode_hdr</item>
<item>@drawable/ic_scene_mode_refocus</item>
<item>@drawable/ic_scene_mode_optizoom</item>
- <item>@drawable/ic_scene_mode_portrait</item>
- <item>@drawable/ic_scene_mode_landscape</item>
- <item>@drawable/ic_scene_mode_sports</item>
- <item>@drawable/ic_scene_mode_flower</item>
+ <item>@drawable/ic_scene_mode_action</item>
+ <item>@drawable/ic_scene_mode_entry_antimotionblur</item>
+ <item>@drawable/ic_scene_mode_entry_aqua</item>
+ <item>@drawable/ic_scene_mode_entry_ar</item>
+ <item>@drawable/ic_scene_mode_entry_baby</item>
+ <item>@drawable/ic_scene_mode_entry_backgroundblur</item>
<item>@drawable/ic_scene_mode_backlight</item>
- <item>@drawable/ic_scene_mode_candlelight</item>
- <item>@drawable/ic_scene_mode_sunset</item>
- <item>@drawable/ic_scene_mode_night</item>
+ <item>@drawable/ic_scene_mode_backlight</item>
+ <item>@drawable/ic_scene_mode_entry_backlightportrait</item>
+ <item>@drawable/ic_scene_mode_entry_backlightportrait</item>
+ <item>@drawable/ic_scene_mode_entry_barcode</item>
<item>@drawable/ic_scene_mode_beach</item>
+ <item>@drawable/ic_scene_mode_entry_beauty</item>
+ <item>@drawable/ic_scene_mode_candlelight</item>
+ <item>@drawable/ic_scene_mode_entry_cine</item>
+ <item>@drawable/ic_scene_mode_entry_closeup</item>
+ <item>@drawable/ic_scene_mode_entry_dark</item>
+ <item>@drawable/ic_scene_mode_entry_dish</item>
+ <item>@drawable/ic_scene_mode_entry_duskdawn</item>
+ <item>@drawable/ic_scene_mode_entry_document</item>
+ <item>@drawable/ic_scene_mode_entry_fallcolor</item>
+ <item>@drawable/ic_scene_mode_entry_fireworks</item>
+ <item>@drawable/ic_scene_mode_flower</item>
+ <item>@drawable/ic_scene_mode_entry_handheldtwilight</item>
+ <item>@drawable/ic_scene_mode_entry_highsensitivity</item>
+ <item>@drawable/ic_scene_mode_entry_indoor</item>
+ <item>@drawable/ic_scene_mode_landscape</item>
+ <item>@drawable/ic_scene_mode_entry_macro</item>
+ <item>@drawable/ic_scene_mode_entry_mix_illuminant</item>
+ <item>@drawable/ic_scene_mode_entry_mood</item>
+ <item>@drawable/ic_scene_mode_entry_night</item>
+ <item>@drawable/ic_scene_mode_entry_nightportrait</item>
+ <item>@drawable/ic_scene_mode_entry_nightportrait</item>
+ <item>@drawable/ic_scene_mode_entry_nightindoor</item>
+ <item>@drawable/ic_scene_mode_entry_oldfilm</item>
+ <item>@drawable/ic_scene_mode_party</item>
+ <item>@drawable/ic_scene_mode_pet</item>
+ <item>@drawable/ic_scene_mode_portrait</item>
<item>@drawable/ic_scene_mode_snow</item>
+ <item>@drawable/ic_scene_softskin</item>
+ <item>@drawable/ic_scene_mode_sports</item>
+ <item>@drawable/ic_scene_mode_entry_spotlight</item>
+ <item>@drawable/ic_scene_mode_entry_steadyphoto</item>
+ <item>@drawable/ic_scene_mode_sunset</item>
+ <item>@drawable/ic_scene_mode_entry_supernight</item>
+ <item>@drawable/ic_scene_mode_entry_sweepstitch</item>
+ <item>@drawable/ic_scene_mode_entry_text</item>
+ <item>@drawable/ic_scene_mode_entry_theatre</item>
+ <item>@drawable/ic_scene_mode_entry_whiteboard</item>
<item>@drawable/ic_scene_mode_smartauto</item>
</array>