camera: Add all resolutions, focus modes, scene modes, and color effects.

Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3

6 files changed, 320 insertions, 86 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a4cc51928..b2f277eb3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -175,86 +175,133 @@
 
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries" translatable="false">
-        <item>@string/pref_camera_picturesize_entry_20mp</item>
+        <item>@string/pref_camera_picturesize_entry_20_7mp</item>
+        <item>@string/pref_camera_picturesize_entry_18mp</item>
         <item>@string/pref_camera_picturesize_entry_16mp</item>
+        <item>@string/pref_camera_picturesize_entry_15_9mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_13mp</item>
+        <item>@string/pref_camera_picturesize_entry_13mp</item>
+        <item>@string/pref_camera_picturesize_entry_12_8mp</item>
+        <item>@string/pref_camera_picturesize_entry_12_7mp</item>
         <item>@string/pref_camera_picturesize_entry_12mp</item>
+        <item>@string/pref_camera_picturesize_entry_11_9mp</item>
+        <item>@string/pref_camera_picturesize_entry_11_5mp</item>
+        <item>@string/pref_camera_picturesize_entry_10_4mp</item>
+        <item>@string/pref_camera_picturesize_entry_10mp</item>
+        <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_9mp</item>
+        <item>@string/pref_camera_picturesize_entry_8_2mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_8mp</item>
-        <item>@string/pref_camera_picturesize_entry_square</item>
+        <item>@string/pref_camera_picturesize_entry_7_7mp</item>
+        <item>@string/pref_camera_picturesize_entry_6_4mp</item>
+        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
         <item>@string/pref_camera_picturesize_entry_5mp</item>
+        <item>@string/pref_camera_picturesize_entry_4_5mp</item>
         <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_4mp</item>
+        <item>@string/pref_camera_picturesize_entry_3_7mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_3mp</item>
         <item>@string/pref_camera_picturesize_entry_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
+        <item>@string/pref_camera_picturesize_entry_2_5mp</item>
+        <item>@string/pref_camera_picturesize_entry_2_1mp_wide</item>
         <item>@string/pref_camera_picturesize_entry_2mp</item>
         <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_1_9mp</item>
         <item>@string/pref_camera_picturesize_entry_1_5mp</item>
         <item>@string/pref_camera_picturesize_entry_1_3mp</item>
-        <item>@string/pref_camera_picturesize_entry_1280x768</item>
-        <item>@string/pref_camera_picturesize_entry_1280x720</item>
         <item>@string/pref_camera_picturesize_entry_1mp</item>
-        <item>@string/pref_camera_picturesize_entry_800x600</item>
-        <item>@string/pref_camera_picturesize_entry_800x480</item>
-        <item>960 x 720</item>
-        <item>720 x 480</item>
+        <item>@string/pref_camera_picturesize_entry_wxga</item>
+        <item>@string/pref_camera_picturesize_entry_xga</item>
+        <item>@string/pref_camera_picturesize_entry_svga</item>
+        <item>@string/pref_camera_picturesize_entry_wvga</item>
         <item>@string/pref_camera_picturesize_entry_vga</item>
-        <item>@string/pref_camera_picturesize_entry_352x288</item>
+        <item>@string/pref_camera_picturesize_entry_nhd_wide</item>
+        <item>@string/pref_camera_picturesize_entry_wqvga</item>
         <item>@string/pref_camera_picturesize_entry_qvga</item>
-        <item>@string/pref_camera_picturesize_entry_176x144</item>
     </string-array>
+
     <!-- When launching the camera app first time, we will set the picture
          size to the first one in the list that is also supported by the
          driver -->
     <string-array name="pref_camera_picturesize_entryvalues" translatable="false">
         <item>5248x3936</item>
+        <item>4992x3744</item>
         <item>4608x3456</item>
+        <item>5312x2988</item>
+        <item>4208x3120</item>
         <item>4160x3120</item>
+        <item>4128x3096</item>
+        <item>4128x3088</item>
         <item>4000x3000</item>
+        <item>3984x2988</item>
+        <item>3920x2940</item>
+        <item>4128x2528</item>
+        <item>4320x2432</item>
+        <item>4160x2340</item>
+        <item>3920x2204</item>
         <item>3840x2160</item>
         <item>3264x2448</item>
-        <item>2976x2976</item>
+        <item>3200x2400</item>
+        <item>3264x1968</item>
+        <item>3264x1840</item>
+        <item>3264x1836</item>
         <item>2592x1944</item>
         <item>2592x1936</item>
         <item>2560x1920</item>
-        <item>2688x1512</item>
+        <item>2592x1728</item>
+        <item>2688x1520</item>
+        <item>2560x1536</item>
+        <item>2560x1440</item>
         <item>2048x1536</item>
         <item>2048x1520</item>
+        <item>2048x1232</item>
         <item>1920x1080</item>
         <item>1600x1200</item>
         <item>1920x1088</item>
-        <item>1440x1080</item>
+        <item>1392x1392</item>
+        <item>1600x960</item>
         <item>1280x960</item>
-        <item>1280x768</item>
         <item>1280x720</item>
         <item>1024x768</item>
+        <item>1024x600</item>
         <item>800x600</item>
         <item>800x480</item>
-        <item>960x720</item>
-        <item>720x480</item>
         <item>640x480</item>
-        <item>352x288</item>
+        <item>640x360</item>
+        <item>480x320</item>
         <item>320x240</item>
-        <item>176x144</item>
     </string-array>
 
     <!-- Camera Preferences focus mode dialog box entries -->
     <string-array name="pref_camera_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
+        <item>@string/pref_camera_focusmode_entry_continuous</item>
+        <item>@string/pref_camera_focusmode_entry_extended</item>
+        <item>@string/pref_camera_focusmode_entry_facedetect</item>
+        <item>@string/pref_camera_focusmode_entry_facepriority</item>
+        <item>@string/pref_camera_focusmode_entry_fixed</item>
         <item>@string/pref_camera_focusmode_entry_infinity</item>
         <item>@string/pref_camera_focusmode_entry_macro</item>
         <item>@string/pref_camera_focusmode_entry_normal</item>
-        <item>@string/pref_camera_focusmode_entry_continuous</item>
+        <item>@string/pref_camera_focusmode_entry_portrait</item>
+        <item>@string/pref_camera_focusmode_entry_hyperfocal</item>
     </string-array>
 
     <string-array name="pref_camera_focusmode_entryvalues" translatable="false">
         <item>auto</item>
+        <item>continuous-picture</item>
+        <item>extended</item>
+        <item>facedetect</item>
+        <item>face-priority</item>
+        <item>fixed</item>
         <item>infinity</item>
         <item>macro</item>
         <item>normal</item>
-        <item>continuous-picture</item>
+        <item>portrait</item>
+        <item>hyperfocal</item>
     </string-array>
 
     <string-array name="pref_camera_focusmode_labels" translatable="false">
@@ -399,16 +446,55 @@
         <item>@string/pref_camera_scenemode_entry_auto</item>
         <item>@string/pref_camera_scenemode_entry_hdr</item>
         <item>@string/pref_camera_scenemode_entry_refocus</item>
-        <item>@string/pref_camera_scenemode_entry_portrait</item>
-        <item>@string/pref_camera_scenemode_entry_landscape</item>
-        <item>@string/pref_camera_scenemode_entry_sports</item>
-        <item>@string/pref_camera_scenemode_entry_flowers</item>
+        <item>@string/pref_camera_scenemode_entry_action</item>
+        <item>@string/pref_camera_scenemode_entry_antimotionblur</item>
+        <item>@string/pref_camera_scenemode_entry_aqua</item>
+        <item>@string/pref_camera_scenemode_entry_ar</item>
+        <item>@string/pref_camera_scenemode_entry_baby</item>
+        <item>@string/pref_camera_scenemode_entry_backgroundblur</item>
         <item>@string/pref_camera_scenemode_entry_backlight</item>
+        <item>@string/pref_camera_scenemode_entry_backlight</item>
+        <item>@string/pref_camera_scenemode_entry_backlightportrait</item>
+        <item>@string/pref_camera_scenemode_entry_backlightportrait</item>
+        <item>@string/pref_camera_scenemode_entry_barcode</item>
+        <item>@string/pref_camera_scenemode_entry_beach</item>
+        <item>@string/pref_camera_scenemode_entry_beauty</item>
         <item>@string/pref_camera_scenemode_entry_candlelight</item>
-        <item>@string/pref_camera_scenemode_entry_sunset</item>
+        <item>@string/pref_camera_scenemode_entry_cine</item>
+        <item>@string/pref_camera_scenemode_entry_closeup</item>
+        <item>@string/pref_camera_scenemode_entry_dark</item>
+        <item>@string/pref_camera_scenemode_entry_dish</item>
+        <item>@string/pref_camera_scenemode_entry_duskdawn</item>
+        <item>@string/pref_camera_scenemode_entry_document</item>
+        <item>@string/pref_camera_scenemode_entry_fallcolor</item>
+        <item>@string/pref_camera_scenemode_entry_fireworks</item>
+        <item>@string/pref_camera_scenemode_entry_flowers</item>
+        <item>@string/pref_camera_scenemode_entry_handheldtwilight</item>
+        <item>@string/pref_camera_scenemode_entry_highsensitivity</item>
+        <item>@string/pref_camera_scenemode_entry_indoor</item>
+        <item>@string/pref_camera_scenemode_entry_landscape</item>
+        <item>@string/pref_camera_focusmode_entry_macro</item>
+        <item>@string/pref_camera_scenemode_entry_mix_illuminant</item>
+        <item>@string/pref_camera_scenemode_entry_mood</item>
         <item>@string/pref_camera_scenemode_entry_night</item>
-        <item>@string/pref_camera_scenemode_entry_beach</item>
+        <item>@string/pref_camera_scenemode_entry_nightportrait</item>
+        <item>@string/pref_camera_scenemode_entry_nightportrait</item>
+        <item>@string/pref_camera_scenemode_entry_nightindoor</item>
+        <item>@string/pref_camera_scenemode_entry_oldfilm</item>
+        <item>@string/pref_camera_scenemode_entry_party</item>
+        <item>@string/pref_camera_scenemode_entry_pet</item>
+        <item>@string/pref_camera_scenemode_entry_portrait</item>
         <item>@string/pref_camera_scenemode_entry_snow</item>
+        <item>@string/pref_camera_scenemode_entry_softskin</item>
+        <item>@string/pref_camera_scenemode_entry_sports</item>
+        <item>@string/pref_camera_scenemode_entry_spotlight</item>
+        <item>@string/pref_camera_scenemode_entry_steadyphoto</item>
+        <item>@string/pref_camera_scenemode_entry_sunset</item>
+        <item>@string/pref_camera_scenemode_entry_supernight</item>
+        <item>@string/pref_camera_scenemode_entry_sweepstitch</item>
+        <item>@string/pref_camera_scenemode_entry_text</item>
+        <item>@string/pref_camera_scenemode_entry_theatre</item>
+        <item>@string/pref_camera_scenemode_entry_whiteboard</item>
     </string-array>
 
     <array name="scenemode_thumbnails" translatable="false">
@@ -447,16 +533,55 @@
         <item>auto</item>
         <item>hdr</item>
         <item>@string/pref_camera_advanced_feature_value_refocus_on</item>
-        <item>portrait</item>
-        <item>landscape</item>
-        <item>sports</item>
-        <item>flowers</item>
+        <item>action</item>
+        <item>anti-motion-blur</item>
+        <item>aqua</item>
+        <item>AR</item>
+        <item>baby</item>
+        <item>background-blur</item>
+        <item>back-light</item>
         <item>backlight</item>
+        <item>backlight_portrait</item>
+        <item>backlight-portrait</item>
+        <item>barcode</item>
+        <item>beach</item>
+        <item>beauty-mode</item>
         <item>candlelight</item>
-        <item>sunset</item>
+        <item>cine</item>
+        <item>closeup</item>
+        <item>dark</item>
+        <item>dish</item>
+        <item>dusk-dawn</item>
+        <item>document</item>
+        <item>fall-color</item>
+        <item>fireworks</item>
+        <item>flowers</item>
+        <item>handheld-twilight</item>
+        <item>high-sensitivity</item>
+        <item>indoor</item>
+        <item>landscape</item>
+        <item>macro</item>
+        <item>mix-illuminant</item>
+        <item>mood</item>
         <item>night</item>
-        <item>beach</item>
+        <item>night-portrait</item>
+        <item>nightportrait</item>
+        <item>night-indoor</item>
+        <item>old-film</item>
+        <item>party</item>
+        <item>pet</item>
+        <item>portrait</item>
         <item>snow</item>
+        <item>soft-skin</item>
+        <item>sports</item>
+        <item>spot-light</item>
+        <item>steadyphoto</item>
+        <item>sunset</item>
+        <item>super-night</item>
+        <item>sweep-stitch</item>
+        <item>text</item>
+        <item>theatre</item>
+        <item>white-board</item>
     </string-array>
 
     <array name="camera_id_entries" translatable="false">
@@ -571,6 +696,7 @@
 
     <!-- Default focus mode setting.-->
     <string-array name="pref_camera_focusmode_default_array" translatable="false">
+        <item>continuous-picture</item>
         <item>auto</item>
     </string-array>
 
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 000000000..930db48c4
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Settings screen, dialog choice for 20.7 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
+    <!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
+    <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_16mp">16M pixels</string>
+    <!-- Settings screen, dialog choice for 15.9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
+    <!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
+    <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] -->
+    <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
+    <!-- Settings screen, dialog choice for 11.9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_11_9mp">11.9M pixels</string>
+    <!-- Settings screen, dialog choice for 11.5 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
+    <!-- Settings screen, dialog choice for 10.4 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
+    <!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
+    <!-- Settings screen, dialog choice for 9.7 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
+    <!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
+    <!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
+    <!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 4.5 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
+    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
+    <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
+    <!-- Settings screen, dialog choice for 3.7 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
+    <!-- Settings screen, dialog choice for 2.1 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 1.9 megapixels picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
+    <!-- Settings screen, dialog choice for WXGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
+    <!-- Settings screen, dialog choice for XGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_xga">XGA</string>
+    <!-- Settings screen, dialog choice for SVGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_svga">SVGA</string>
+    <!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
+    <!-- Settings screen, dialog choice for WVGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
+    <!-- Settings screen, dialog choice for WQVGA picture size [CHAR LIMIT=15] -->
+    <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
+
+    <!-- Settings screen, scene mode -->
+    <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+    <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+    <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+    <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+    <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+    <string name="pref_camera_scenemode_entry_baby">Baby</string>
+    <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+    <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+    <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+    <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+    <string name="pref_camera_scenemode_entry_beach">Beach</string>
+    <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+    <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+    <string name="pref_camera_scenemode_entry_cine">Cine</string>
+    <string name="pref_camera_scenemode_entry_closeup">Closeup</string>
+    <string name="pref_camera_scenemode_entry_dark">Dark</string>
+    <string name="pref_camera_scenemode_entry_dish">Dish</string>
+    <string name="pref_camera_scenemode_entry_duskdawn">Duskdawn</string>
+    <string name="pref_camera_scenemode_entry_document">Document</string>
+    <string name="pref_camera_scenemode_entry_fallcolor">Fallcolor</string>
+    <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+    <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+    <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+    <string name="pref_camera_scenemode_entry_highsensitivity">High sensivity</string>
+    <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+    <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+    <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+    <string name="pref_camera_scenemode_entry_mood">Mood</string>
+    <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+    <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+    <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+    <string name="pref_camera_scenemode_entry_pet">Pet</string>
+    <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+    <string name="pref_camera_scenemode_entry_snow">Snow</string>
+    <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+    <string name="pref_camera_scenemode_entry_sports">Sports</string>
+    <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+    <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+    <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+    <string name="pref_camera_scenemode_entry_text">Text</string>
+    <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+    <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
+
+    <!-- Settings screen, focus mode -->
+    <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+    <string name="pref_camera_focusmode_entry_extended">Extended</string>
+    <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+    <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+    <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+    <string name="pref_camera_focusmode_entry_normal">Normal</string>
+    <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+    <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
+
+    <!-- Color effects -->
+    <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+    <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+    <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+    <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+    <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+    <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+    <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonize</string>
+
+</resources>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index ca6ddc2e8..3af2153e1 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -233,6 +233,13 @@
         <item>@string/pref_camera_coloreffect_entry_redtint</item>
         <item>@string/pref_camera_coloreffect_entry_bluetint</item>
         <item>@string/pref_camera_coloreffect_entry_greentint</item>
+        <item>@string/pref_camera_coloreffect_entry_washed</item>
+        <item>@string/pref_camera_coloreffect_entry_vintage_warm</item>
+        <item>@string/pref_camera_coloreffect_entry_vintage_cold</item>
+        <item>@string/pref_camera_coloreffect_entry_point_green</item>
+        <item>@string/pref_camera_coloreffect_entry_point_blue</item>
+        <item>@string/pref_camera_coloreffect_entry_point_red_yellow</item>
+        <item>@string/pref_camera_coloreffect_entry_cartoonize</item>
     </string-array>
 
     <array name="coloreffect_thumbnails" translatable="false">
@@ -269,6 +276,13 @@
         <item>red-tint</item>
         <item>blue-tint</item>
         <item>green-tint</item>
+        <item>washed</item>
+        <item>vintage-warm</item>
+        <item>vintage-cold</item>
+        <item>point-green</item>
+        <item>point-blue</item>
+        <item>point-red-yellow</item>
+        <item>cartoonize</item>
     </string-array>
 
     <!-- Camera Preferences AE Bracketing dialog box entries -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a2b6b7231..b3af06b89 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -743,39 +743,6 @@
     <string name="pref_camera_picturesize_entry_352x288">CIF</string>
     <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
 
-    <string name="pref_camera_focusmode_entry_normal">Normal</string>
-    <string name="pref_camera_focusmode_entry_continuous">CAF</string>
-
-    <string name="pref_camera_scenemode_entry_asd">ASD</string>
-    <!-- Scene mode that takes an image with as little noise as possible so details of the subject are maintained. -->
-    <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
-    <!-- Scene mode that takes an image of a landscape assuming all subjects are relatively far from the phone. -->
-    <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
-
-     <!-- Scene mode that takes night shots with long exposure and flash to illuminate the subject while still capturing darker detail in the background. -->
-    <string name="pref_camera_scenemode_entry_night_portrait">Night Portrait</string>
-    <!-- Scene mode to be used in a stage show. -->
-    <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
-    <!-- Scene mode optimized for taking images on the beach. -->
-    <string name="pref_camera_scenemode_entry_beach">Beach</string>
-    <!-- Scene mode optimized for taking images in the snow. -->
-    <string name="pref_camera_scenemode_entry_snow">Snow</string>
-
-    <!-- Scene mode for taking a photo as sharp as possible. -->
-    <string name="pref_camera_scenemode_entry_steadyphoto">Steady Photo</string>
-    <!-- Scene mode optimized for taking images of fireworks. -->
-    <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
-    <!-- Scene mode optimized for taking images during sports . -->
-    <string name="pref_camera_scenemode_entry_sports">Sports</string>
-    <!-- Scene mode optimized for capturing the naturally warm color of scenes lit by candles. [CHAR LIMIT=16] -->
-    <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
-    <!-- Scene mode for taking a photo with backlight. -->
-    <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
-    <!-- Scene mode optimized for taking images of flowers. -->
-    <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
-    <!-- Scene mode optimized for taking images of AR. -->
-    <string name="pref_camera_scenemode_entry_ar">AR</string>
-
     <!-- Default auto scene detection setting. -->
     <string name="pref_camera_scenedetect_default" translatable="false">off</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e2d627df5..8ba8295df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -247,10 +247,6 @@
     Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_2160p" translatable="false">
     4k UHD</string>
-    <!-- Video quality setting entry.
-    Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] -->
-    <string name="pref_video_quality_entry_4kuhd" translatable="false">
-    4k UHD</string>
     <!-- Video quality setting entry. Videos will be recorded in 1080p quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_1080p" translatable="false">HD 1080p</string>
     <!-- Video quality setting entry. Videos will be recorded in 720p quality. [CHAR LIMIT=24] -->
@@ -271,18 +267,11 @@
 
     <!-- Settings screen, Picture size title -->
     <string name="pref_camera_picturesize_title">Picture size</string>
-    <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_20mp">20M pixels</string>
-    <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_16mp">16M pixels</string>
+
     <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_13mp">13M pixels</string>
-    <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
     <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
-    <!-- Settings screen, dialog choice for square picture size [CHAR LIMIT=20] -->
-    <string name="pref_camera_picturesize_entry_square">Square (1:1)</string>
     <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_5mp">5M pixels</string>
     <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
@@ -374,7 +363,7 @@
     <string name="pref_camera_scenemode_title">Scene mode</string>
 
     <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
-    <string name="pref_camera_scenemode_entry_auto">Automatic</string>
+    <string name="pref_camera_scenemode_entry_auto">Auto</string>
     <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
     <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
@@ -395,8 +384,6 @@
     <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
     <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_party">Party</string>
-    <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
-    <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
 
     <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
     <string name="pref_camera_scenemode_label_auto">NONE</string>
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 70263da20..db3bf274c 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -819,10 +819,8 @@ public class CameraSettings {
                     disMode, getSupportedDISModes(mParameters));
         }
         if (focusMode != null) {
-            if (!CameraUtil.isFocusAreaSupported(mParameters)) {
-                filterUnsupportedOptions(group,
-                        focusMode, mParameters.getSupportedFocusModes());
-            }
+            filterUnsupportedOptions(group,
+                    focusMode, mParameters.getSupportedFocusModes());
         }
         if (videoFlashMode != null) {
             filterUnsupportedOptions(group,