SnapdragonCamera: Complete the function of MFNR/MFSR

Complete the function of MFNR/MFSR.

CRs-Fixed: 2275738
Change-Id: Icc45de57a2d1febbdb74e57f3e6e0b76d08a51b6

4 files changed, 65 insertions, 0 deletions

diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 0c07ed743..8c877476b 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -1195,4 +1195,24 @@ for time lapse recording -->
         <item>@string/pref_camera2_stats_visualizer_entry_value_enable_hist</item>
     </string-array>
 
+    <string-array name="pref_camera2_capture_mfnr_entries" translatable="false">
+        <item>@string/pref_camera2_capture_mfnr_entry_disable</item>
+        <item>@string/pref_camera2_capture_mfnr_entry_enable</item>
+    </string-array>
+
+    <string-array name="pref_camera2_capture_mfnr_entryvalues" translatable="false">
+        <item>@string/pref_camera2_capture_mfnr_entry_value_disable</item>
+        <item>@string/pref_camera2_capture_mfnr_entry_value_enable</item>
+    </string-array>
+
+    <string-array name="pref_camera2_capture_mfsr_entries" translatable="false">
+        <item>@string/pref_camera2_capture_mfsr_entry_disable</item>
+        <item>@string/pref_camera2_capture_mfsr_entry_enable</item>
+    </string-array>
+
+    <string-array name="pref_camera2_capture_mfsr_entryvalues" translatable="false">
+        <item>@string/pref_camera2_capture_mfsr_entry_value_disable</item>
+        <item>@string/pref_camera2_capture_mfsr_entry_value_enable</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index ff8bc9728..280d421cf 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1271,5 +1271,19 @@
     <string name="pref_camera2_stats_visualizer_entry_value_enable_be" translatable="false">2</string>
     <string name="pref_camera2_stats_visualizer_entry_value_enable_hist" translatable="false">3</string>
 
+    <string name="pref_camera2_capture_mfnr_title" translatable="true">Capture MFNR</string>
+    <string name="pref_camera2_capture_mfnr_default" translatable="false">0</string>
+    <string name="pref_camera2_capture_mfnr_entry_enable" translatable="true">enable</string>
+    <string name="pref_camera2_capture_mfnr_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_capture_mfnr_entry_value_enable" translatable="false">1</string>
+    <string name="pref_camera2_capture_mfnr_entry_value_disable" translatable="false">0</string>
+
+    <string name="pref_camera2_capture_mfsr_title" translatable="true">Capture MFSR</string>
+    <string name="pref_camera2_capture_mfsr_default" translatable="false">0</string>
+    <string name="pref_camera2_capture_mfsr_entry_enable" translatable="true">enable</string>
+    <string name="pref_camera2_capture_mfsr_entry_disable" translatable="true">disable</string>
+    <string name="pref_camera2_capture_mfsr_entry_value_enable" translatable="false">1</string>
+    <string name="pref_camera2_capture_mfsr_entry_value_disable" translatable="false">0</string>
+
 </resources>
 
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index af724b536..a3b47cbfa 100755
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -440,4 +440,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>