diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-04 12:50:28 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-25 21:55:20 -0700 |
| commit | 346d14280075daa0625d1f349551a3d13f45c327 (patch) | |
| tree | 92271a33e045d927c612d072c763d9a66e69fa44 /res/xml | |
| parent | 8f9b937e4889cc29d4c1d2836e587a974d0ae75a (diff) | |
| download | android_packages_apps_Snap-346d14280075daa0625d1f349551a3d13f45c327.tar.gz android_packages_apps_Snap-346d14280075daa0625d1f349551a3d13f45c327.tar.bz2 android_packages_apps_Snap-346d14280075daa0625d1f349551a3d13f45c327.zip | |
snap: Merge strings
Change-Id: I42c7e6ba08b4214a28e74fb7cd63a43bf5de724f
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/capture_preferences.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 70cf9fa4f..0c3040172 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -128,8 +128,8 @@ <IconListPreference camera:defaultValue="@string/pref_camera_redeyereduction_default" - camera:entries="@array/pref_camera2_redeyereduction_entries" - camera:entryValues="@array/pref_camera2_redeyereduction_entryvalues" + camera:entries="@array/pref_camera_redeyereduction_entries" + camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" camera:key="pref_camera2_redeyereduction_key" camera:singleIcon="@drawable/ic_settings_redeye" camera:title="@string/pref_camera_redeyereduction_title"/> @@ -192,29 +192,29 @@ camera:title="@string/pref_camera2_makeup_title"/> <IconListPreference - camera:entries="@array/pref_camera2_video_quality_entries" - camera:entryValues="@array/pref_camera2_video_quality_entryvalues" + camera:entries="@array/pref_video_quality_entries" + camera:entryValues="@array/pref_video_quality_entryvalues" camera:key="pref_camera2_video_quality_key" camera:singleIcon="@drawable/ic_settings_quality" camera:title="@string/pref_video_quality_title"/> <ListPreference camera:defaultValue="@string/pref_camera_videoencoder_default" - camera:entries="@array/pref_camera2_videoencoder_entries" - camera:entryValues="@array/pref_camera2_videoencoder_entryvalues" + camera:entries="@array/pref_camera_videoencoder_entries" + camera:entryValues="@array/pref_camera_videoencoder_entryvalues" camera:key="pref_camera2_videoencoder_key" camera:title="@string/pref_camera_videoencoder_title"/> <ListPreference camera:defaultValue="@string/pref_camera_audioencoder_default" - camera:entries="@array/pref_camera2_audioencoder_entries" - camera:entryValues="@array/pref_camera2_audioencoder_entryvalues" + camera:entries="@array/pref_camera_audioencoder_entries" + camera:entryValues="@array/pref_camera_audioencoder_entryvalues" camera:key="pref_camera2_audioencoder_key" camera:title="@string/pref_camera_audioencoder_title"/> <IconListPreference camera:defaultValue="@string/pref_camera_dis_default" - camera:entries="@array/pref_camera2_dis_entries" - camera:entryValues="@array/pref_camera2_dis_entryvalues" + camera:entries="@array/pref_camera_dis_entries" + camera:entryValues="@array/pref_camera_dis_entryvalues" camera:key="pref_camera2_dis_key" camera:singleIcon="@drawable/ic_eis_menu" camera:title="@string/pref_camera_dis_title"/> @@ -228,19 +228,19 @@ <IconListPreference camera:defaultValue="@string/pref_camera_video_flashmode_default" - camera:entries="@array/pref_camera2_video_flashmode_entries" - camera:entryValues="@array/pref_camera2_video_flashmode_entryvalues" + camera:entries="@array/pref_camera_video_flashmode_entries" + camera:entryValues="@array/pref_camera_video_flashmode_entryvalues" camera:icons="@array/video_flashmode_icons" camera:key="pref_camera2_video_flashmode_key" - camera:labelList="@array/pref_camera2_video_flashmode_labels" + camera:labelList="@array/pref_camera_video_flashmode_labels" camera:largeIcons="@array/video_flashmode_largeicons" camera:singleIcon="@drawable/ic_settings_flash" camera:title="@string/pref_camera_flashmode_title"/> <ListPreference camera:defaultValue="@string/pref_camera_video_rotation_default" - camera:entries="@array/pref_camera2_video_rotation_entries" - camera:entryValues="@array/pref_camera2_video_rotation_entryvalues" + camera:entries="@array/pref_camera_video_rotation_entries" + camera:entryValues="@array/pref_camera_video_rotation_entryvalues" camera:key="pref_camera2_video_rotation_key" camera:title="@string/pref_camera_video_rotation_title"/> @@ -253,8 +253,8 @@ <IconListPreference camera:defaultValue="@string/pref_camera_facedetection_default" - camera:entries="@array/pref_camera2_facedetection_entries" - camera:entryValues="@array/pref_camera2_facedetection_entryvalues" + camera:entries="@array/pref_camera_facedetection_entries" + camera:entryValues="@array/pref_camera_facedetection_entryvalues" camera:key="pref_camera2_facedetection_key" camera:singleIcon="@drawable/ic_settings_facerec" camera:title="@string/pref_camera_facedetection_title"/> |