commit 7549f8d2981c19d899c119c6df177a04516f3ff9
author Camera Software Integration <camswint@localhost> Tue Dec 20 02:56:04 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 20 02:56:04 2016 -0800
tree 8543888e7bea3ba1b07247a4b43cb5badfff4cd1
parent 99a560573f7275a3540517a1bb122ce059ce1578
parent b07761c05719ec203f41d729c9874d14072a76c2

Merge "SnapdragonCamera: Fix don`t save the value about focus distance" into camera.lnx.1.0-dev.1.0

res/xml/setting_menu_preferences.xml

diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 5cf6c0d..9c9d5d2 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -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