diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-13 14:50:38 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-13 14:50:38 -0800 |
commit | 10b0543c7483a85046efed8ba653630483cd6b2e (patch) | |
tree | bacee846c8435a91c788235f403e863e63aa7f25 /res | |
parent | 27f7cb6cbea918c84b2d67bfb9307022a5167d29 (diff) | |
parent | de86a77ef2a1107274d1f8561a170156566797cf (diff) | |
download | android_packages_apps_Snap-10b0543c7483a85046efed8ba653630483cd6b2e.tar.gz android_packages_apps_Snap-10b0543c7483a85046efed8ba653630483cd6b2e.tar.bz2 android_packages_apps_Snap-10b0543c7483a85046efed8ba653630483cd6b2e.zip |
Merge "change video noise reduction setting option" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'res')
-rwxr-xr-x | res/values/qcomstrings.xml | 2 | ||||
-rwxr-xr-x | res/xml/capture_preferences.xml | 4 | ||||
-rwxr-xr-x | res/xml/setting_menu_preferences.xml | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | res/xml/video_preferences.xml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 057d1fde8..62e0a4108 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1012,7 +1012,7 @@ <string name="pref_camera2_makeup_title" translatable="true">Makeup</string> - <string name="pref_camera2_noise_reduction_default" translatable="false">off</string> + <string name="pref_camera2_noise_reduction_default" translatable="false">high-quality</string> <string name="pref_camera2_noise_reduction_title" translatable="true">Noise Reduction</string> <string name="pref_camera2_noise_reduction_entry_off" translatable="true">@string/pref_camera_noise_reduction_entry_off</string> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 5f3ff3e37..0337f3e37 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -250,11 +250,11 @@ camera:title="@string/pref_camera_dis_title"/> <ListPreference - camera:defaultValue="@string/pref_camera_noise_reduction_default" + camera:defaultValue="@string/pref_camera2_noise_reduction_default" camera:entries="@array/pref_camera2_noise_reduction_entries" camera:entryValues="@array/pref_camera2_noise_reduction_entryvalues" camera:key="pref_camera2_noise_reduction_key" - camera:title="@string/pref_camera_noise_reduction_title"/> + camera:title="@string/pref_camera2_noise_reduction_title"/> <IconListPreference camera:defaultValue="@string/pref_camera_video_flashmode_default" diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index c4969714a..af1b3901b 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -207,14 +207,14 @@ android:title="@string/pref_camera_dis_title" /> <ListPreference - android:defaultValue="@string/pref_camera_noise_reduction_default" + android:defaultValue="@string/pref_camera2_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" /> + android:title="@string/pref_camera2_noise_reduction_title" /> <ListPreference android:defaultValue="@string/pref_camera_videoencoder_default" diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 3fafddda7..66e2e0524 100644..100755 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -151,8 +151,8 @@ camera:entryValues="@array/pref_camera_hfr_entryvalues"/> <ListPreference camera:key="pref_camera_noise_reduction_key" - camera:defaultValue="@string/pref_camera_noise_reduction_default" - camera:title="@string/pref_camera_noise_reduction_title" + camera:defaultValue="@string/pref_camera2_noise_reduction_default" + camera:title="@string/pref_camera2_noise_reduction_title" camera:entries="@array/pref_camera_noise_reduction_entries" camera:entryValues="@array/pref_camera_noise_reduction_entryvalues"/> <ListPreference |