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

Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3

5 files changed, 258 insertions, 66 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1bae1a800..0e83c5278 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -310,18 +310,30 @@
     <!-- 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">
@@ -477,16 +489,55 @@
         <item>@string/pref_camera_scenemode_entry_hdr</item>
         <item>@string/pref_camera_scenemode_entry_refocus</item>
         <item>@string/pref_camera_scenemode_entry_optizoom</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>
         <item>@string/pref_camera_scenemode_entry_asd</item>
     </string-array>
 
@@ -495,16 +546,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_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
         <item>@drawable/ic_scene_mode_backlight</item>
+        <item>@drawable/ic_scene_mode_backlight</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_beach</item>
+        <item>@drawable/ic_sce</item>
         <item>@drawable/ic_scene_mode_candlelight</item>
-        <item>@drawable/ic_scene_mode_sunset</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_flower</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_landscape</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
         <item>@drawable/ic_scene_mode_night</item>
-        <item>@drawable/ic_scene_mode_beach</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_portrait</item>
         <item>@drawable/ic_scene_mode_snow</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_sports</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_scene_mode_sunset</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
+        <item>@drawable/ic_sce</item>
         <item>@drawable/ic_scene_mode_smartauto</item>
     </array>
 
@@ -529,16 +619,55 @@
         <item>hdr</item>
         <item>@string/pref_camera_advanced_feature_value_refocus_on</item>
         <item>@string/pref_camera_advanced_feature_value_optizoom_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>
         <item>asd</item>
     </string-array>
 
@@ -655,6 +784,7 @@
     <!-- Default focus mode setting.-->
     <string-array name="pref_camera_focusmode_default_array" translatable="false">
         <item>continuous-picture</item>
+        <item>auto</item>
     </string-array>
 
     <!-- Icons for exposure compensation -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 000000000..db63addad
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,82 @@
+<?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, scene mode -->
+    <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 sensitivity</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 abe18706d..53b2ba7d1 100755
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -215,6 +215,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">
@@ -233,6 +240,13 @@
         <item>0</item>
         <item>0</item>
         <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
     </array>
 
     <string-array name="pref_camera_coloreffect_entryvalues" translatable="false">
@@ -251,6 +265,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 7ceb400dd..a367a1022 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -802,39 +802,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 604697412..3ef70c630 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -245,18 +245,10 @@
     <string name="pref_video_quality_title">Video quality</string>
     <!-- The default quality value is NULL -->
     <string name="pref_video_quality_default" translatable="false">1920x1080</string>
-    <!-- Video quality setting entry.
-    Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
-    <string name="pref_video_quality_entry_4kdci" translatable="false">
-    4k DCI</string>
-    <!-- Video quality setting entry.
-    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 4k DCI quality. [CHAR LIMIT=24] -->
+    <string name="pref_video_quality_entry_4kdci" translatable="false">4k DCI</string>
+    <!-- Video quality setting entry. 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 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] -->
@@ -391,7 +383,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] -->