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 | |
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
-rw-r--r-- | res/values/camera2arrays.xml | 152 | ||||
-rw-r--r-- | res/xml/capture_preferences.xml | 34 |
2 files changed, 17 insertions, 169 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 089838405..13a287091 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -521,31 +521,6 @@ <item>1600</item> </string-array> - <!-- Camera Preferences Auto Exposure dialog box entries --> - <string-array name="pref_camera2_autoexposure_entries"> - <item>@string/pref_camera_autoexposure_entry_frameaverage</item> - <item>@string/pref_camera_autoexposure_entry_centerweighted</item> - <item>@string/pref_camera_autoexposure_entry_spotmetering</item> - </string-array> - - <!-- Do not localize entryvalues --> - <string-array name="pref_camera2_autoexposure_entryvalues"> - <item>@string/pref_camera_autoexposure_value_frameaverage</item> - <item>@string/pref_camera_autoexposure_value_centerweighted</item> - <item>@string/pref_camera_autoexposure_value_spotmetering</item> - </string-array> - - <!-- Camera Preferences Redeye Reduction dialog box entries --> - <string-array name="pref_camera2_redeyereduction_entries" translatable="false"> - <item>@string/pref_camera_redeyereduction_entry_disable</item> - <item>@string/pref_camera_redeyereduction_entry_enable</item> - </string-array> - - <string-array name="pref_camera2_redeyereduction_entryvalues" translatable="false"> - <item>disable</item> - <item>enable</item> - </string-array> - <!-- Camera Preferences Long Shot dialog box entries --> <string-array name="pref_camera2_longshot_entries" translatable="false"> <item>@string/setting_off</item> @@ -557,77 +532,6 @@ <item>@string/setting_on_value</item> </string-array> - <string-array name="pref_camera2_filter_mode_entries" translatable="false"> - <item>@string/pref_camera_filter_mode_entry_off</item> - <item>@string/pref_camera_filter_mode_entry_on</item> - </string-array> - <string-array name="pref_camera2_filter_mode_entryvalues" translatable="false"> - <item>Off</item> - <item>On</item> - </string-array> - - <string-array name="pref_camera2_filter_mode_icons" translatable="false"> - <item>@drawable/ic_settings_filter</item> - <item>@drawable/ic_settings_filter_on</item> - </string-array> - - <string-array name="pref_camera2_video_quality_entries" translatable="false"> - <item>@string/pref_video_quality_entry_4kdci</item> - <item>@string/pref_video_quality_entry_2160p</item> - <item>@string/pref_video_quality_entry_qHD</item> - <item>@string/pref_video_quality_entry_2k</item> - <item>@string/pref_video_quality_entry_1080p</item> - <item>@string/pref_video_quality_entry_720p</item> - <item>@string/pref_video_quality_entry_480p</item> - <item>@string/pref_video_quality_entry_vga</item> - <item>@string/pref_video_quality_entry_cif</item> - <item>@string/pref_video_quality_entry_qvga</item> - <item>@string/pref_video_quality_entry_qcif</item> - </string-array> - - <string-array name="pref_camera2_video_quality_entryvalues" translatable="false"> - <item>4096x2160</item> - <item>3840x2160</item> - <item>2560x1440</item> - <item>2048x1080</item> - <item>1920x1080</item> - <item>1280x720</item> - <item>720x480</item> - <item>640x480</item> - <item>352x288</item> - <item>320x240</item> - <item>176x144</item> - </string-array> - - <string-array name="pref_camera2_video_duration_entries" translatable="false"> - <item>@string/pref_camera_video_duration_entry_mms</item> - <item>@string/pref_camera_video_duration_entry_10</item> - <item>@string/pref_camera_video_duration_entry_30</item> - <item>@string/pref_camera_video_duration_entry_nolimit</item> - </string-array> - - <!-- The numbers are in minutes, except -1 means the duration suitable for mms. --> - <string-array name="pref_camera2_video_duration_entryvalues" translatable="false"> - <item>-1</item> - <item>10</item> - <item>30</item> - <item>0</item> - </string-array> - - <string-array name="pref_camera2_videoencoder_entries" translatable="false"> - <item>@string/pref_camera_videoencoder_entry_0</item> - <item>@string/pref_camera_videoencoder_entry_1</item> - <item>@string/pref_camera_videoencoder_entry_2</item> - <item>@string/pref_camera_videoencoder_entry_3</item> - </string-array> - - <string-array name="pref_camera2_videoencoder_entryvalues" translatable="false"> - <item>mpeg-4-sp</item> - <item>h263</item> - <item>h264</item> - <item>h265</item> - </string-array> - <string-array name="pref_camera2_audioencoder_entries" translatable="false"> <item>@string/pref_camera_audioencoder_entry_0</item> <item>@string/pref_camera_audioencoder_entry_1</item> @@ -638,16 +542,6 @@ <item>aac</item> </string-array> - <string-array name="pref_camera2_dis_entries" translatable="false"> - <item>@string/pref_camera_dis_entry_off</item> - <item>@string/pref_camera_dis_entry_on</item> - </string-array> - - <string-array name="pref_camera2_dis_entryvalues" translatable="false"> - <item>@string/pref_camera_dis_value_disable</item> - <item>@string/pref_camera_dis_value_enable</item> - </string-array> - <string-array name="pref_camera2_noise_reduction_entries" translatable="false"> <item>@string/pref_camera2_noise_reduction_entry_off</item> <item>@string/pref_camera2_noise_reduction_entry_fast</item> @@ -660,42 +554,6 @@ <item>@string/pref_camera2_noise_reduction_value_high_quality</item> </string-array> - <string-array name="pref_camera2_video_flashmode_entries" translatable="false"> - <item>@string/pref_camera_flashmode_entry_off</item> - <item>@string/pref_camera_flashmode_entry_on</item> - </string-array> - - <string-array name="pref_camera2_video_flashmode_labels" translatable="false"> - <item>@string/pref_camera_flashmode_label_off</item> - <item>@string/pref_camera_flashmode_label_on</item> - </string-array> - - <string-array name="pref_camera2_video_flashmode_entryvalues" translatable="false"> - <item>off</item> - <item>torch</item> - </string-array> - - <string-array name="pref_camera2_video_rotation_entries" translatable="false"> - <item>@string/pref_camera_video_rotation_entry_0</item> - <item>@string/pref_camera_video_rotation_entry_90</item> - <item>@string/pref_camera_video_rotation_entry_180</item> - <item>@string/pref_camera_video_rotation_entry_270</item> - </string-array> - - <string-array name="pref_camera2_video_rotation_labels" translatable="false"> - <item>@string/pref_camera_video_rotation_label_0</item> - <item>@string/pref_camera_video_rotation_label_90</item> - <item>@string/pref_camera_video_rotation_label_180</item> - <item>@string/pref_camera_video_rotation_label_270</item> - </string-array> - - <string-array name="pref_camera2_video_rotation_entryvalues" translatable="false"> - <item>0</item> - <item>90</item> - <item>180</item> - <item>270</item> - </string-array> - <!-- These values correspond to the time interval between frame capture in millseconds for time lapse recording --> <string-array name="pref_camera2_video_time_lapse_frame_interval_entryvalues" translatable="false"> @@ -786,16 +644,6 @@ for time lapse recording --> <item>@string/pref_video_time_lapse_frame_interval_86400000</item> </string-array> - <string-array name="pref_camera2_facedetection_entries" translatable="false"> - <item>@string/pref_camera_facedetection_entry_off</item> - <item>@string/pref_camera_facedetection_entry_on</item> - </string-array> - - <string-array name="pref_camera2_facedetection_entryvalues" translatable="false"> - <item>off</item> - <item>on</item> - </string-array> - <string-array name="pref_camera2_videosnap_entries" translatable="true"> <item>@string/pref_camera2_videosnap_entry_enable</item> <item>@string/pref_camera2_videosnap_entry_disable</item> 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"/> |