diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:47:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:47:12 -0700 |
| commit | f23eecd0ea167f3968c0d2bb43f3588256bf8b3c (patch) | |
| tree | 6ae72345b6405d721d99f33b422a4697f40e8fa7 /res | |
| parent | a04dd5f1e56bfe54a95134a30ec7ec14eccb9730 (diff) | |
| parent | 0abd747b096e3786cd90a66605e1a39d92453b15 (diff) | |
| download | android_packages_apps_Snap-f23eecd0ea167f3968c0d2bb43f3588256bf8b3c.tar.gz android_packages_apps_Snap-f23eecd0ea167f3968c0d2bb43f3588256bf8b3c.tar.bz2 android_packages_apps_Snap-f23eecd0ea167f3968c0d2bb43f3588256bf8b3c.zip | |
Merge "SnapdragonCamera: disable instant capture in some cases." into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomarrays.xml | 6 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index d3218bdaf..0689ab658 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -833,12 +833,14 @@ </string-array> <string-array name="pref_camera_instant_capture_entries" translatable="true"> - <item>@string/pref_camera_instant_capture_entry_enable</item> + <item>@string/pref_camera_instant_capture_entry_aggressive_aec</item> + <item>@string/pref_camera_instant_capture_entry_fast_aec</item> <item>@string/pref_camera_instant_capture_entry_disable</item> </string-array> <string-array name="pref_camera_instant_capture_entry_values" translatable="false"> - <item>@string/pref_camera_instant_capture_value_enable</item> + <item>@string/pref_camera_instant_capture_value_aggressive_aec</item> + <item>@string/pref_camera_instant_capture_value_fast_aec</item> <item>@string/pref_camera_instant_capture_value_disable</item> </string-array> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index ea90cf72a..ee287bc44 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -202,12 +202,14 @@ <!-- Instant Capture entry --> <string name="pref_camera_instant_capture_title" translatable="true">Instant Capture</string> - <string name="pref_camera_instant_capture_entry_enable" translatable="true">Enable</string> + <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string> + <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string> <string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string> <!-- Instant Capture entry values --> <string name="pref_camera_instant_capture_default" translatable="false">0</string> - <string name="pref_camera_instant_capture_value_enable" translatable="false">1</string> + <string name="pref_camera_instant_capture_value_aggressive_aec" translatable="false">1</string> + <string name="pref_camera_instant_capture_value_fast_aec" translatable="false">2</string> <string name="pref_camera_instant_capture_value_disable" translatable="false">0</string> <!-- Settings screen, ZSL location dialog choices --> |