Add color effect UI to indicator wheel.

Change-Id: I9f6724e6b5410fa4758dc0f0d4d28c5dc377567a

47 files changed, 62 insertions, 77 deletions

diff --git a/res/drawable-hdpi/btn_coloreffect_aqua.jpg b/res/drawable-hdpi/btn_coloreffect_aqua.jpg
new file mode 100644
index 00000000..d3ca021f
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_aqua.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_bluetint.jpg b/res/drawable-hdpi/btn_coloreffect_bluetint.jpg
new file mode 100644
index 00000000..1bfc5827
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_bluetint.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_greentint.jpg b/res/drawable-hdpi/btn_coloreffect_greentint.jpg
new file mode 100644
index 00000000..7de8c42a
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_greentint.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_mono.jpg b/res/drawable-hdpi/btn_coloreffect_mono.jpg
new file mode 100644
index 00000000..d0477d70
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_mono.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_negative.jpg b/res/drawable-hdpi/btn_coloreffect_negative.jpg
new file mode 100644
index 00000000..4a6bf34c
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_negative.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_none.jpg b/res/drawable-hdpi/btn_coloreffect_none.jpg
new file mode 100644
index 00000000..9131f796
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_none.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_posterize.jpg b/res/drawable-hdpi/btn_coloreffect_posterize.jpg
new file mode 100644
index 00000000..09fb1d1e
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_posterize.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_redtint.jpg b/res/drawable-hdpi/btn_coloreffect_redtint.jpg
new file mode 100644
index 00000000..b88ebe91
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_redtint.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_sepia.jpg b/res/drawable-hdpi/btn_coloreffect_sepia.jpg
new file mode 100644
index 00000000..192a05b2
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_sepia.jpg
diff --git a/res/drawable-hdpi/btn_coloreffect_solarize.jpg b/res/drawable-hdpi/btn_coloreffect_solarize.jpg
new file mode 100644
index 00000000..8a37b79b
--- /dev/null
+++ b/res/drawable-hdpi/btn_coloreffect_solarize.jpg
diff --git a/res/drawable-hdpi/ic_viewfinder_coloreffect.png b/res/drawable-hdpi/ic_viewfinder_coloreffect.png
new file mode 100644
index 00000000..975b08b7
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_coloreffect.png
diff --git a/res/drawable-hdpi/ic_viewfinder_coloreffects.png b/res/drawable-hdpi/ic_viewfinder_coloreffects.png
new file mode 100644
index 00000000..1d65e4bb
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_coloreffects.png
diff --git a/res/drawable-mdpi/btn_coloreffect_aqua.jpg b/res/drawable-mdpi/btn_coloreffect_aqua.jpg
new file mode 100644
index 00000000..d3ca021f
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_aqua.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_bluetint.jpg b/res/drawable-mdpi/btn_coloreffect_bluetint.jpg
new file mode 100644
index 00000000..1bfc5827
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_bluetint.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_greentint.jpg b/res/drawable-mdpi/btn_coloreffect_greentint.jpg
new file mode 100644
index 00000000..7de8c42a
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_greentint.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_mono.jpg b/res/drawable-mdpi/btn_coloreffect_mono.jpg
new file mode 100644
index 00000000..d0477d70
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_mono.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_negative.jpg b/res/drawable-mdpi/btn_coloreffect_negative.jpg
new file mode 100644
index 00000000..4a6bf34c
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_negative.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_none.jpg b/res/drawable-mdpi/btn_coloreffect_none.jpg
new file mode 100644
index 00000000..9131f796
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_none.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_posterize.jpg b/res/drawable-mdpi/btn_coloreffect_posterize.jpg
new file mode 100644
index 00000000..09fb1d1e
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_posterize.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_redtint.jpg b/res/drawable-mdpi/btn_coloreffect_redtint.jpg
new file mode 100644
index 00000000..b88ebe91
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_redtint.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_sepia.jpg b/res/drawable-mdpi/btn_coloreffect_sepia.jpg
new file mode 100644
index 00000000..192a05b2
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_sepia.jpg
diff --git a/res/drawable-mdpi/btn_coloreffect_solarize.jpg b/res/drawable-mdpi/btn_coloreffect_solarize.jpg
new file mode 100644
index 00000000..8a37b79b
--- /dev/null
+++ b/res/drawable-mdpi/btn_coloreffect_solarize.jpg
diff --git a/res/drawable-mdpi/ic_viewfinder_coloreffect.png b/res/drawable-mdpi/ic_viewfinder_coloreffect.png
new file mode 100644
index 00000000..975b08b7
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_coloreffect.png
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f453601..476a4523 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarizace"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posterizace"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Voda"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastelové barvy"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaika"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Červený nádech"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Modrý nádech"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Zelený nádech"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 45263037..e33ac9d9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarize"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posterize"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Vand"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rød farvetone"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blå farvetone"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grøn farvetone"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2800d95a..6ae8b2f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarisieren"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Tontrennung"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rottöne"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blautöne"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grüntöne"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 48252eab..13def51f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Υπερφώτιση"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Ποστεροποίηση"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Γαλάζιο"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Παστέλ"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Μωσαϊκό"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Κόκκινη απόχρωση"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Μπλε απόχρωση"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Πράσινη απόχρωση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b038998b..f9901a1b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarizar"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posterizar"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aguamarina"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tinte rojo"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tinte azul"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tinte verde"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f186c2be..d3c2fa4a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarizar"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posterizar"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Agua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tono rojo"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tono azul"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tono verde"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2f9adf86..db147cac 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Soleil direct"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Postérisation"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aquatique"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaïque"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Teinte rouge"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Teinte bleue"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Teinte verte"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4ab58ea2..5eb7bda2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarizza"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posterizza"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Acqua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastello"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tinta rossa"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tinta blu"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tinta verde"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 478a98b9..93ba81ca 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"ソラライズ"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"ポスタライズ"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"アクア"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"パステル"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"モザイク"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"色合い（赤）"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"色合い（青）"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"色合い（緑）"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 34a7c42f..942bddfc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"감광"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"포스터"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"아쿠아"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"파스텔"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"모자이크"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"빨간색 농담"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"파란색 농담"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"녹색 농담"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8dae11a4..62199555 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Overeksponer"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posteriser"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Vann"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaikk"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Rødskjær"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blåskjær"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grønnskjær"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 47720808..49277d5a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solariseren"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Postereffect"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaïek"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Roodtinten"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blauwtinten"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Groentinten"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ebc7e718..57bba46a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solaryzacja"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Posteryzacja"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Akwarela"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaika"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Odcień czerwony"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Odcień niebieski"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Odcień zielony"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f7463393..26245aaa 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarização"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Póster"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Azul-marinho"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Tonalidade vermelha"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Tonalidade azul"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Tonalidade verde"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ddf0c996..77c548a7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarizar"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Transformar em pôster"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Tons pastéis"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaico"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Filtro vermelho"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Filtro azul"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Filtro verde"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c49228ff..81d54b21 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Соляризация"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Постеризация"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Под водой"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Пастель"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Мозаика"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Красный оттенок"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Синий оттенок"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Зеленый оттенок"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 53f052e7..8058c128 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Solarisera"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Färgreduktion"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Aqua"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastell"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mosaik"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Röd ton"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Blå ton"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Grön ton"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 28e6143d..6aab12ef 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"Güneş ışığı etkisi"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"Poster efekti ver"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"Su"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"Pastel"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"Mozaik"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"Kırmızı ton"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"Mavi ton"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"Yeşil ton"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e9d10f6..39ea979b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"曝光"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"色调分离"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"浅绿色"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"柔和"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"马赛克"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"偏红"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"偏蓝"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"偏绿"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d47f5ae1..e1ac6328 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -87,8 +87,6 @@
     <string name="pref_camera_coloreffect_entry_solarize" msgid="7399297076108412329">"曝光效果"</string>
     <string name="pref_camera_coloreffect_entry_posterize" msgid="8596847197608350695">"色調分離"</string>
     <string name="pref_camera_coloreffect_entry_aqua" msgid="224075791902166343">"水底效果"</string>
-    <string name="pref_camera_coloreffect_entry_pastel" msgid="1263931790863509482">"粉蠟筆效果"</string>
-    <string name="pref_camera_coloreffect_entry_mosaic" msgid="1756287704236443515">"馬賽克效果"</string>
     <string name="pref_camera_coloreffect_entry_redtint" msgid="7135044258970245718">"紅色調"</string>
     <string name="pref_camera_coloreffect_entry_bluetint" msgid="987468567611774716">"藍色調"</string>
     <string name="pref_camera_coloreffect_entry_greentint" msgid="4205380735971677893">"綠色調"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d5901cb4..7d6cb8a7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -31,7 +31,7 @@
         <item>youtube</item>
     </string-array>
 
-    <array name="video_quality_icons" translatable="false">
+    <array name="video_quality_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_video_quality_high</item>
         <item>@drawable/ic_viewfinder_video_quality_low</item>
         <item>@drawable/ic_viewfinder_video_quality_mms</item>
@@ -82,7 +82,7 @@
         <item>10000</item>
     </string-array>
 
-    <array name="video_time_lapse_quality_icons" translatable="false">
+    <array name="video_time_lapse_quality_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_video_time_lapse_quality_low</item>
         <item>@drawable/ic_viewfinder_video_time_lapse_quality_high</item>
         <item>@drawable/ic_viewfinder_video_time_lapse_quality_480p</item>
@@ -161,13 +161,13 @@
         <item>off</item>
     </string-array>
 
-    <array name="pref_camera_flashmode_icons">
+    <array name="camera_flashmode_icons" translatable="false">
         <item>@drawable/ic_menuselect_flash_auto</item>
         <item>@drawable/ic_menuselect_flash_on</item>
         <item>@drawable/ic_menuselect_flash_off</item>
     </array>
 
-    <array name="flashmode_icons">
+    <array name="camera_flashmode_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_flash_auto</item>
         <item>@drawable/ic_viewfinder_flash_on</item>
         <item>@drawable/ic_viewfinder_flash_off</item>
@@ -184,12 +184,12 @@
         <item>off</item>
     </string-array>
 
-    <array name="pref_camera_video_flashmode_icons">
+    <array name="video_flashmode_icons" translatable="false">
         <item>@drawable/ic_menuselect_flash_on</item>
         <item>@drawable/ic_menuselect_flash_off</item>
     </array>
 
-    <array name="video_flashmode_icons">
+    <array name="video_flashmode_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_flash_on</item>
         <item>@drawable/ic_viewfinder_flash_off</item>
     </array>
@@ -204,12 +204,12 @@
         <item>@string/pref_camera_recordlocation_entry_on</item>
     </array>
 
-    <array name="pref_camera_recordlocation_icons" translatable="false">
+    <array name="camera_recordlocation_icons" translatable="false">
         <item>@drawable/ic_menuselect_gps_off</item>
         <item>@drawable/ic_menuselect_gps_on</item>
     </array>
 
-    <array name="recordlocation_icons">
+    <array name="camera_recordlocation_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_gps_off</item>
         <item>@drawable/ic_viewfinder_gps_on</item>
     </array>
@@ -231,7 +231,7 @@
         <item>cloudy-daylight</item>
     </string-array>
 
-    <array name="pref_camera_whitebalance_icons">
+    <array name="whitebalance_icons" translatable="false">
         <item>@drawable/ic_menuselect_wb_auto</item>
         <item>@drawable/ic_menuselect_wb_incandescent</item>
         <item>@drawable/ic_menuselect_wb_daylight</item>
@@ -239,7 +239,7 @@
         <item>@drawable/ic_menuselect_wb_cloudy</item>
     </array>
 
-    <array name="whitebalance_icons">
+    <array name="whitebalance_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_wb_auto</item>
         <item>@drawable/ic_viewfinder_wb_incandescent</item>
         <item>@drawable/ic_viewfinder_wb_daylight</item>
@@ -247,7 +247,7 @@
         <item>@drawable/ic_viewfinder_wb_cloudy</item>
     </array>
 
-    <array name="whitebalance_images">
+    <array name="whitebalance_images" translatable="false">
         <item>@drawable/btn_wb_auto</item>
         <item>@drawable/btn_wb_incandescent</item>
         <item>@drawable/btn_wb_daylight</item>
@@ -264,8 +264,6 @@
         <item>@string/pref_camera_coloreffect_entry_solarize</item>
         <item>@string/pref_camera_coloreffect_entry_posterize</item>
         <item>@string/pref_camera_coloreffect_entry_aqua</item>
-        <item>@string/pref_camera_coloreffect_entry_pastel</item>
-        <item>@string/pref_camera_coloreffect_entry_mosaic</item>
         <item>@string/pref_camera_coloreffect_entry_redtint</item>
         <item>@string/pref_camera_coloreffect_entry_bluetint</item>
         <item>@string/pref_camera_coloreffect_entry_greentint</item>
@@ -279,13 +277,38 @@
         <item>solarize</item>
         <item>posterize</item>
         <item>aqua</item>
-        <item>pastel</item>
-        <item>mosaic</item>
         <item>red-tint</item>
         <item>blue-tint</item>
         <item>green-tint</item>
     </string-array>
 
+    <!-- Color effect has no separate icons. -->
+    <array name="coloreffect_largeicons" translatable="false">
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+        <item>@drawable/ic_viewfinder_coloreffect</item>
+    </array>
+
+    <array name="coloreffect_images" translatable="false">
+        <item>@drawable/btn_coloreffect_none</item>
+        <item>@drawable/btn_coloreffect_mono</item>
+        <item>@drawable/btn_coloreffect_sepia</item>
+        <item>@drawable/btn_coloreffect_negative</item>
+        <item>@drawable/btn_coloreffect_solarize</item>
+        <item>@drawable/btn_coloreffect_posterize</item>
+        <item>@drawable/btn_coloreffect_aqua</item>
+        <item>@drawable/btn_coloreffect_redtint</item>
+        <item>@drawable/btn_coloreffect_bluetint</item>
+        <item>@drawable/btn_coloreffect_greentint</item>
+    </array>
+
     <!-- Camera Preferences Scene Mode dialog box entries -->
     <string-array name="pref_camera_scenemode_entries" translatable="false">
         <item>@string/pref_camera_scenemode_entry_auto</item>
@@ -321,12 +344,12 @@
         <item>candlelight</item>
     </string-array>
 
-    <array name="pref_camera_id_icons" translatable="false">
+    <array name="camera_id_icons" translatable="false">
         <item>@drawable/ic_menuselect_camera_facing_back</item>
         <item>@drawable/ic_menuselect_camera_facing_front</item>
     </array>
 
-    <array name="id_icons">
+    <array name="camera_id_largeicons" translatable="false">
         <item>@drawable/ic_viewfinder_camera_facing_back</item>
         <item>@drawable/ic_viewfinder_camera_facing_front</item>
     </array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1711dd12..7ce4af24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -263,8 +263,6 @@
     <string name="pref_camera_coloreffect_entry_solarize">Solarize</string>
     <string name="pref_camera_coloreffect_entry_posterize">Posterize</string>
     <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
-    <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
-    <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
     <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
     <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
     <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 761c65b9..87ce63bc 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -22,8 +22,8 @@
                 camera:key="pref_camera_flashmode_key"
                 camera:defaultValue="@string/pref_camera_flashmode_default"
                 camera:title="@string/pref_camera_flashmode_title"
-                camera:icons="@array/pref_camera_flashmode_icons"
-                camera:largeIcons="@array/flashmode_icons"
+                camera:icons="@array/camera_flashmode_icons"
+                camera:largeIcons="@array/camera_flashmode_largeicons"
                 camera:entries="@array/pref_camera_flashmode_entries"
                 camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
         <ListPreference
@@ -40,23 +40,25 @@
                 camera:key="pref_camera_whitebalance_key"
                 camera:defaultValue="@string/pref_camera_whitebalance_default"
                 camera:title="@string/pref_camera_whitebalance_title"
-                camera:icons="@array/pref_camera_whitebalance_icons"
-                camera:largeIcons="@array/whitebalance_icons"
+                camera:icons="@array/whitebalance_icons"
+                camera:largeIcons="@array/whitebalance_largeicons"
                 camera:images="@array/whitebalance_images"
                 camera:entries="@array/pref_camera_whitebalance_entries"
                 camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
-        <ListPreference
+        <IconListPreference
                 camera:key="pref_camera_coloreffect_key"
                 camera:defaultValue="@string/pref_camera_coloreffect_default"
                 camera:title="@string/pref_camera_coloreffect_title"
+                camera:largeIcons="@array/coloreffect_largeicons"
+                camera:images="@array/coloreffect_images"
                 camera:entries="@array/pref_camera_coloreffect_entries"
                 camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
         <RecordLocationPreference
                 camera:key="pref_camera_recordlocation_key"
                 camera:defaultValue="@string/pref_camera_recordlocation_default"
                 camera:title="@string/pref_camera_recordlocation_title"
-                camera:icons="@array/pref_camera_recordlocation_icons"
-                camera:largeIcons="@array/recordlocation_icons"
+                camera:icons="@array/camera_recordlocation_icons"
+                camera:largeIcons="@array/camera_recordlocation_largeicons"
                 camera:entries="@array/pref_camera_recordlocation_entries"
                 camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
         <ListPreference
@@ -80,7 +82,7 @@
                 camera:key="pref_camera_id_key"
                 camera:defaultValue="@string/pref_camera_id_default"
                 camera:title="@string/pref_camera_id_title"
-                camera:icons="@array/pref_camera_id_icons"
-                camera:largeIcons="@array/id_icons" />
+                camera:icons="@array/camera_id_icons"
+                camera:largeIcons="@array/camera_id_largeicons" />
     </PreferenceGroup>
 </PreferenceGroup>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index c52db533..af68abea 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -22,14 +22,14 @@
                 camera:key="pref_video_quality_key"
                 camera:defaultValue="@string/pref_video_quality_default"
                 camera:title="@string/pref_video_quality_title"
-                camera:largeIcons="@array/video_quality_icons"
+                camera:largeIcons="@array/video_quality_largeicons"
                 camera:entries="@array/pref_video_quality_entries"
                 camera:entryValues="@array/pref_video_quality_entryvalues"/>
         <IconListPreference
                 camera:key="pref_video_time_lapse_quality_key"
                 camera:defaultValue="@string/pref_video_time_lapse_quality_default"
                 camera:title="@string/pref_video_time_lapse_quality_title"
-                camera:largeIcons="@array/video_time_lapse_quality_icons"
+                camera:largeIcons="@array/video_time_lapse_quality_largeicons"
                 camera:entries="@array/pref_video_time_lapse_quality_entries"
                 camera:entryValues="@array/pref_video_time_lapse_quality_entryvalues"/>
         <ListPreference
@@ -42,30 +42,32 @@
                 camera:key="pref_camera_video_flashmode_key"
                 camera:defaultValue="@string/pref_camera_video_flashmode_default"
                 camera:title="@string/pref_camera_flashmode_title"
-                camera:icons="@array/pref_camera_video_flashmode_icons"
-                camera:largeIcons="@array/video_flashmode_icons"
+                camera:icons="@array/video_flashmode_icons"
+                camera:largeIcons="@array/video_flashmode_largeicons"
                 camera:entries="@array/pref_camera_video_flashmode_entries"
                 camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
         <IconListPreference
                 camera:key="pref_camera_whitebalance_key"
                 camera:defaultValue="@string/pref_camera_whitebalance_default"
                 camera:title="@string/pref_camera_whitebalance_title"
-                camera:icons="@array/pref_camera_whitebalance_icons"
-                camera:largeIcons="@array/whitebalance_icons"
+                camera:icons="@array/whitebalance_icons"
+                camera:largeIcons="@array/whitebalance_largeicons"
                 camera:images="@array/whitebalance_images"
                 camera:entries="@array/pref_camera_whitebalance_entries"
                 camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
-        <ListPreference
+        <IconListPreference
                 camera:key="pref_camera_coloreffect_key"
                 camera:defaultValue="@string/pref_camera_coloreffect_default"
                 camera:title="@string/pref_camera_coloreffect_title"
+                camera:largeIcons="@array/coloreffect_largeicons"
+                camera:images="@array/coloreffect_images"
                 camera:entries="@array/pref_camera_coloreffect_entries"
                 camera:entryValues="@array/pref_camera_coloreffect_entryvalues"/>
         <IconListPreference
                 camera:key="pref_camera_id_key"
                 camera:defaultValue="@string/pref_camera_id_default"
                 camera:title="@string/pref_camera_id_title"
-                camera:icons="@array/pref_camera_id_icons"
-                camera:largeIcons="@array/id_icons" />
+                camera:icons="@array/camera_id_icons"
+                camera:largeIcons="@array/camera_id_largeicons"/>
     </PreferenceGroup>
 </PreferenceGroup>