diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-07-25 10:20:17 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | 900db9a5d43331250bb017495a9e41790f4e077e (patch) | |
| tree | 8a4e370e4e2947d16c73437fc33bf964426143db /res | |
| parent | e508a686eb4400bf6d77228aff3046505186b1e8 (diff) | |
| download | android_packages_apps_Snap-900db9a5d43331250bb017495a9e41790f4e077e.tar.gz android_packages_apps_Snap-900db9a5d43331250bb017495a9e41790f4e077e.tar.bz2 android_packages_apps_Snap-900db9a5d43331250bb017495a9e41790f4e077e.zip | |
SnapdragonCamera: Saving MPO and DDM without CS
Saving MPO and DDM without CS
CRs-Fixed: 993611
Change-Id: Ie04bce460c57454b4cf57c88b47ef2a495b6e078
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/camera2arrays.xml | 11 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 12 | ||||
| -rw-r--r-- | res/xml/capture_preferences.xml | 7 |
3 files changed, 28 insertions, 2 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index bee116425..2548887c0 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -90,6 +90,17 @@ <item>@string/pref_camera2_clearsight_value_on</item> </string-array> + <string-array name="pref_camera2_mpo_entries" translatable="true"> + <item>@string/pref_camera2_mpo_entry_off</item> + <item>@string/pref_camera2_mpo_entry_on</item> + </string-array> + + <string-array name="pref_camera2_mpo_entryvalues" translatable="false"> + <item>@string/pref_camera2_mpo_value_off</item> + <item>@string/pref_camera2_mpo_value_on</item> + </string-array> + + <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values -1 refers to ones not supported in Camera2 API 0 is special case added for auto (meaning off) diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 371c03ac8..b60099e2b 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -567,8 +567,8 @@ <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string> <string name="pref_camera2_clearsight_default" translatable="false">on</string> - <string name="pref_camera2_clearsight_entry_on" translatable="false">On</string> - <string name="pref_camera2_clearsight_entry_off" translatable="false">Off</string> + <string name="pref_camera2_clearsight_entry_on" translatable="true">On</string> + <string name="pref_camera2_clearsight_entry_off" translatable="true">Off</string> <string name="pref_camera2_clearsight_value_on" translatable="false">on</string> <string name="pref_camera2_clearsight_value_off" translatable="false">off</string> @@ -576,6 +576,14 @@ <string name="clearsight_capture_success">ClearSight capture successful</string> <string name="clearsight_capture_fail">ClearSight capture failed</string> + <string name="pref_camera2_mpo_title" translatable="true">MPO Format</string> + <string name="pref_camera2_mpo_default" translatable="false">off</string> + <string name="pref_camera2_mpo_entry_on" translatable="true">On</string> + <string name="pref_camera2_mpo_entry_off" translatable="true">Off</string> + + <string name="pref_camera2_mpo_value_on" translatable="false">on</string> + <string name="pref_camera2_mpo_value_off" translatable="false">off</string> + <string name="pref_camera2_scenemode_default" translatable="false">0</string> <string name="pref_camera2_whitebalance_default" translatable="false">1</string> <string name="pref_camera2_coloreffect_default" translatable="false">0</string> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index a71ce6d14..298d9cc9f 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -107,6 +107,13 @@ camera:key="pref_camera2_clearsight_key" camera:title="@string/pref_camera2_clearsight_title"/> + <ListPreference + camera:defaultValue="@string/pref_camera2_mpo_default" + camera:entries="@array/pref_camera2_mpo_entries" + camera:entryValues="@array/pref_camera2_mpo_entryvalues" + camera:key="pref_camera2_mpo_key" + camera:title="@string/pref_camera2_mpo_title"/> + <IconListPreference camera:defaultValue="@string/pref_camera2_coloreffect_default" camera:entries="@array/pref_camera2_coloreffect_entries" |