diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-20 09:44:15 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-20 09:44:15 -0800 |
| commit | 9d57d8828c1482bf92ba5821a2ac7a670a510d4b (patch) | |
| tree | 45e07f2bf8d8462f833745deb11acf5f3386efa9 /res/values | |
| parent | 8f2f71efa7ed4e8f8f7a82bcf10c3b70341f918c (diff) | |
| parent | 2e1e3f96100551feed54b507e7ad1dad52b637f1 (diff) | |
| download | android_packages_apps_Snap-9d57d8828c1482bf92ba5821a2ac7a670a510d4b.tar.gz android_packages_apps_Snap-9d57d8828c1482bf92ba5821a2ac7a670a510d4b.tar.bz2 android_packages_apps_Snap-9d57d8828c1482bf92ba5821a2ac7a670a510d4b.zip | |
Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/qcomarrays.xml | 16 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 20 |
2 files changed, 36 insertions, 0 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 3d08bab1f..4bafc660a 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -561,5 +561,21 @@ <item>@string/pref_camera_video_hdr_value_off</item> <item>@string/pref_camera_video_hdr_value_on</item> </string-array> + + <!-- Camera Preferences Selectable Advanced features dialog box entries --> + <string-array name="pref_camera_advanced_features_entries" translatable="false"> + <item>@string/pref_camera_advanced_feature_entry_none</item> + <item>@string/pref_camera_advanced_feature_entry_ubifocus</item> + <item>@string/pref_camera_advanced_feature_entry_chromaflash</item> + <item>@string/pref_camera_advanced_feature_entry_optizoom</item> + </string-array> + + <string-array name="pref_camera_advanced_features_entryvalues" translatable="false"> + <item>@string/pref_camera_advanced_feature_value_none</item> + <item>@string/pref_camera_advanced_feature_value_ubifocus_on</item> + <item>@string/pref_camera_advanced_feature_value_chromaflash_on</item> + <item>@string/pref_camera_advanced_feature_value_optizoom_on</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 05eec50a5..c63f30b6f 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -133,6 +133,26 @@ <string name="pref_camera_selectablezoneaf_value_centerweighted">center-weighted</string> <string name="pref_camera_selectablezoneaf_value_frameaverage">frame-average</string> + <string name="pref_camera_advanced_feature_default">none</string> + + <!-- Settings screen, Selectable advanced features title --> + <string name="pref_camera_advanced_features_title">Advanced Features</string> + + <!-- Settings screen, Selectable Zone Af dialog radio button choices --> + <string name="pref_camera_advanced_feature_entry_none">None</string> + <string name="pref_camera_advanced_feature_entry_ubifocus">Ubi Focus</string> + <string name="pref_camera_advanced_feature_entry_chromaflash">Chroma Flash</string> + <string name="pref_camera_advanced_feature_entry_optizoom">Opti Zoom</string> + + <!-- Auto exposure entry values. Do not translate. --> + <string name="pref_camera_advanced_feature_value_none">af-bracket-off</string> + <string name="pref_camera_advanced_feature_value_ubifocus_on">af-bracket-on</string> + <string name="pref_camera_advanced_feature_value_chromaflash_on">chroma-flash-on</string> + <string name="pref_camera_advanced_feature_value_optizoom_on">opti-zoom-on</string> + <string name="pref_camera_advanced_feature_value_ubifocus_off">af-bracket-off</string> + <string name="pref_camera_advanced_feature_value_chromaflash_off">chroma-flash-off</string> + <string name="pref_camera_advanced_feature_value_optizoom_off">opti-zoom-off</string> + <!-- Settings screen, ZSL location dialog choices --> <string name="pref_camera_zsl_entry_off">Off</string> <string name="pref_camera_zsl_entry_on">On</string> |