summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/capture_preferences.xml8
-rw-r--r--res/xml/setting_menu_preferences.xml13
2 files changed, 16 insertions, 5 deletions
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index f3603c443..8ad300fe7 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -124,6 +124,14 @@
camera:title="@string/pref_camera_scenemode_title"/>
<IconListPreference
+ camera:defaultValue="@string/pref_camera2_scenemode_default"
+ camera:entries="@array/pref_camera2_scenemode_instructional_entries"
+ camera:entryValues="@array/pref_camera2_scenemode_entryvalues"
+ camera:key="pref_camera2_scenemode_instructional"
+ camera:thumbnails="@array/pref_camera2_scenemode_black_thumbnails"
+ camera:title="@string/pref_camera_scenemode_title"/>
+
+ <IconListPreference
camera:defaultValue="@string/setting_off_value"
camera:entries="@array/pref_camera2_redeyereduction_entries"
camera:entryValues="@array/pref_camera2_redeyereduction_entryvalues"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 87660713a..80097f497 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -31,7 +31,7 @@
<PreferenceCategory
android:key="general"
android:layout="@layout/preferences_category"
- android:title="GENERAL">
+ android:title="@string/perf_camera2_preferences_category_general">
<SwitchPreference
android:defaultValue="false"
android:icon="@drawable/gps_location"
@@ -60,7 +60,7 @@
<PreferenceCategory
android:key="photo"
android:layout="@layout/preferences_category"
- android:title="STILL CAMERA">
+ android:title="@string/perf_camera2_preferences_category_photo">
<ListPreference
android:defaultValue="@string/pref_camera2_timer_value_off"
android:entries="@array/pref_camera2_timer_entries"
@@ -169,7 +169,7 @@
<PreferenceCategory
android:key="video"
android:layout="@layout/preferences_category"
- android:title="VIDEO CAMERA">
+ android:title="@string/perf_camera2_preferences_category_video">
<ListPreference
android:entries="@array/pref_camera2_video_quality_entries"
android:entryValues="@array/pref_camera2_video_quality_entryvalues"
@@ -196,11 +196,14 @@
android:layout="@layout/preference"
android:title="@string/pref_camera_dis_title" />
- <SwitchPreference
- android:defaultValue="false"
+ <ListPreference
+ android:defaultValue="@string/pref_camera_noise_reduction_default"
+ android:entries="@array/pref_camera2_noise_reduction_entries"
+ android:entryValues="@array/pref_camera2_noise_reduction_entryvalues"
android:icon="@drawable/noise_reduction"
android:key="pref_camera2_noise_reduction_key"
android:layout="@layout/preference"
+ android:summary="%s"
android:title="@string/pref_camera_noise_reduction_title" />
<ListPreference