diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2019-02-26 23:10:34 +0000 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2019-03-01 22:04:56 +0000 |
| commit | 39f672bedd8263930d5595b4f7fbc371ef7aba4a (patch) | |
| tree | a3e672b3d23ff9e634738b3b274d280d14dd6701 /res | |
| parent | 0b449ed17e510e47ac281ac1d636847464ab8b72 (diff) | |
| parent | 3f64df28512b6d30787383262bc4ab27c9152e35 (diff) | |
| download | android_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.tar.gz android_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.tar.bz2 android_packages_apps_Snap-39f672bedd8263930d5595b4f7fbc371ef7aba4a.zip | |
Merge tag 'LA.UM.7.3.r1-06900-sdm845.0' into HEAD
"LA.UM.7.3.r1-06900-sdm845.0"
Change-Id: I4e8868d30070d938f48d98858a484607555649f3
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/camera2arrays.xml | 2 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 5a7fe9ac2..24a4571bd 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1056,12 +1056,14 @@ for time lapse recording --> <item>@string/pref_camera2_eis_entry_disable</item> <item>@string/pref_camera2_eis_entry_v2enable</item> <item>@string/pref_camera2_eis_entry_v3enable</item> + <item>@string/pref_camera2_eis_entry_v3_set_when_pause</item> </string-array> <string-array name="pref_camera2_eis_entryvalues" translatable="false"> <item>@string/pref_camera2_eis_entry_value_disable</item> <item>@string/pref_camera2_eis_entry_value_v2enable</item> <item>@string/pref_camera2_eis_entry_value_v3enable</item> + <item>@string/pref_camera2_eis_entry_value_v3_set_when_pause</item> </string-array> <string-array name="pref_camera2_fovc_entries" translatable="false"> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index e89475714..8e02293b0 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1194,9 +1194,11 @@ <string name="pref_camera2_eis_default" translatable="false">disable</string> <string name="pref_camera2_eis_entry_v2enable">V2</string> <string name="pref_camera2_eis_entry_v3enable">V3</string> + <string name="pref_camera2_eis_entry_v3_set_when_pause">V3 and set when pause</string> <string name="pref_camera2_eis_entry_disable">Disabled</string> <string name="pref_camera2_eis_entry_value_v2enable" translatable="false">V2</string> <string name="pref_camera2_eis_entry_value_v3enable" translatable="false">V3</string> + <string name="pref_camera2_eis_entry_value_v3_set_when_pause" translatable="false">V3SetWhenPause</string> <string name="pref_camera2_eis_entry_value_disable" translatable="false">disable</string> <string name="pref_camera2_fovc_title">Video FOVC</string> |