summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-08-05 06:50:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-08-05 06:50:10 -0700
commit198f4d83c8c5db3196c483af0585a60344c4d0c5 (patch)
tree87e4caea42b04c6ceb84fb66b65317ecb628922f /res/xml
parent0dce92c13ff0c2be6cb0984468fefcb49518fd8f (diff)
parent4c647eb4a568f34c425888bef3bd230049114dcb (diff)
downloadandroid_packages_apps_Snap-198f4d83c8c5db3196c483af0585a60344c4d0c5.tar.gz
android_packages_apps_Snap-198f4d83c8c5db3196c483af0585a60344c4d0c5.tar.bz2
android_packages_apps_Snap-198f4d83c8c5db3196c483af0585a60344c4d0c5.zip
Merge "SnapdragonCamera: Complete the function of MFNR/MFSR"
Diffstat (limited to 'res/xml')
-rwxr-xr-xres/xml/capture_preferences.xml14
-rwxr-xr-xres/xml/setting_menu_preferences.xml17
2 files changed, 31 insertions, 0 deletions
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 94fc08fb7..bc74e280b 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -441,4 +441,18 @@
camera:entries="@array/pref_camera2_stats_visualizer_entries"
camera:entryValues="@array/pref_camera2_stats_visualizer_entryvalues" />
+ <ListPreference
+ camera:key="pref_camera2_capture_mfnr_key"
+ camera:defaultValue="@string/pref_camera2_capture_mfnr_default"
+ camera:title="@string/pref_camera2_capture_mfnr_title"
+ camera:entries="@array/pref_camera2_capture_mfnr_entries"
+ camera:entryValues="@array/pref_camera2_capture_mfnr_entryvalues" />
+
+ <ListPreference
+ camera:key="pref_camera2_capture_mfsr_key"
+ camera:defaultValue="@string/pref_camera2_capture_mfsr_default"
+ camera:title="@string/pref_camera2_capture_mfsr_title"
+ camera:entries="@array/pref_camera2_capture_mfsr_entries"
+ camera:entryValues="@array/pref_camera2_capture_mfsr_entryvalues" />
+
</PreferenceGroup>
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index bae2c4ba1..da47590be 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -455,5 +455,22 @@
android:layout="@layout/preference"
android:summary="%s"/>
+ <ListPreference
+ android:key="pref_camera2_capture_mfnr_key"
+ android:defaultValue="@string/pref_camera2_capture_mfnr_default"
+ android:title="@string/pref_camera2_capture_mfnr_title"
+ android:entries="@array/pref_camera2_capture_mfnr_entries"
+ android:entryValues="@array/pref_camera2_capture_mfnr_entryvalues"
+ android:layout="@layout/preference"
+ android:summary="%s"/>
+
+ <ListPreference
+ android:key="pref_camera2_capture_mfsr_key"
+ android:defaultValue="@string/pref_camera2_capture_mfsr_default"
+ android:title="@string/pref_camera2_capture_mfsr_title"
+ android:entries="@array/pref_camera2_capture_mfsr_entries"
+ android:entryValues="@array/pref_camera2_capture_mfsr_entryvalues"
+ android:layout="@layout/preference"
+ android:summary="%s"/>
</PreferenceCategory>
</PreferenceScreen>