diff options
| author | xianming wang <mingwax@codeaurora.org> | 2018-09-21 16:36:36 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2018-10-24 14:10:29 +0800 |
| commit | 846af8fec584e48bbe73834a636b361c1bd25f62 (patch) | |
| tree | 951d3208d6b08b6c9fa3f750f86493e18d1f0bb6 /res | |
| parent | c270e957c3aa214cb833c453a059d5a035670cfe (diff) | |
| download | android_packages_apps_Snap-846af8fec584e48bbe73834a636b361c1bd25f62.tar.gz android_packages_apps_Snap-846af8fec584e48bbe73834a636b361c1bd25f62.tar.bz2 android_packages_apps_Snap-846af8fec584e48bbe73834a636b361c1bd25f62.zip | |
SnapdragonCamera: Complete the function of MFNR
Adapter the function of MFNR and remove the MFSR.
CRs-Fixed: 2337922
Change-Id: I45eb23a14eb9469ccdf335cc1718ffa8c67349fb
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/camera2arrays.xml | 10 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 9 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 7 | ||||
| -rwxr-xr-x | res/xml/setting_menu_preferences.xml | 8 |
4 files changed, 1 insertions, 33 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 6d03c50f5..44748be8f 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1213,14 +1213,4 @@ for time lapse recording --> <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 403fc8b7b..146afe720 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1280,19 +1280,12 @@ <string name="stats_visualizer_bg_label">BG GraphView</string> <string name="stats_visualizer_be_label">BE GraphView</string> - <string name="pref_camera2_capture_mfnr_title" translatable="true">Capture MFNR</string> + <string name="pref_camera2_capture_mfnr_title" translatable="true">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 6aa159555..2ecad2e88 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -463,11 +463,4 @@ 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 c8d433a4b..c4969714a 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -483,13 +483,5 @@ 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> |