summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-xres/values/camera2arrays.xml11
-rwxr-xr-xres/values/qcomstrings.xml4
-rwxr-xr-xres/xml/capture_preferences.xml7
-rwxr-xr-xres/xml/setting_menu_preferences.xml9
4 files changed, 31 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 8242b9c2e..2740bec9e 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -1050,4 +1050,15 @@ for time lapse recording -->
<item>@string/pref_camera2_bsgc_entry_disable</item>
<item>@string/pref_camera2_bsgc_entry_enable</item>
</string-array>
+
+ <string-array name="pref_camera2_zsl_entries" translatable="false">
+ <item>@string/pref_camera2_saveraw_entry_disable</item>
+ <item>@string/pref_camera2_saveraw_entry_enable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_zsl_entryvalues" translatable="false">
+ <item>disable</item>
+ <item>enable</item>
+ </string-array>
+
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index db0edac57..6603701de 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1168,5 +1168,9 @@
<string name="pref_camera2_bsgc_entry_disable" translatable="true">Disable</string>
<string name="pref_camera2_bsgc_entry_value_enable" translatable="false">enable</string>
<string name="pref_camera2_bsgc_entry_value_disable" translatable="false">disable</string>
+ <string name="pref_camera2_zsl_title" translatable="true">ZSL</string>
+ <string name="pref_camera2_zsl_default" translatable="false">enable</string>
+ <string name="pref_camera2_zsl_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera2_zsl_entry_disable" translatable="true">Disable</string>
</resources>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index e1146b55d..b1bb74e7b 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -351,6 +351,13 @@
camera:entryValues="@array/pref_camera2_saveraw_entryvalues" />
<ListPreference
+ camera:key="pref_camera2_zsl_key"
+ camera:defaultValue="@string/pref_camera2_zsl_default"
+ camera:title="@string/pref_camera2_zsl_title"
+ camera:entries="@array/pref_camera2_zsl_entries"
+ camera:entryValues="@array/pref_camera2_zsl_entryvalues" />
+
+ <ListPreference
camera:key="pref_camera2_zoom_key"
camera:defaultValue="@string/pref_camera_zoom_default"
camera:title="@string/pref_camera_zoom_title"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index a8361c201..48b6f99d3 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -340,6 +340,15 @@
android:title="@string/pref_camera2_saveraw_title" />
<ListPreference
+ android:defaultValue="@string/pref_camera2_zsl_default"
+ android:entries="@array/pref_camera2_zsl_entries"
+ android:entryValues="@array/pref_camera2_zsl_entryvalues"
+ android:key="pref_camera2_zsl_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_zsl_title" />
+
+ <ListPreference
android:key="pref_camera2_zoom_key"
android:defaultValue="@string/pref_camera_zoom_default"
android:title="@string/pref_camera_zoom_title"