From c13bc9672f7b2f41d04410a76bf8d06a461b6bcc Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 7 Oct 2014 05:07:51 +0300 Subject: Snap: Cleanup qcom string resources * Remove tons of unused strings * Make some strings shorter to fit better in the settings popup * 'Off' should be always the first option, else the app behaves unexpectedly * Use consistent strings for all on/off options * Replace string references to entryvalues for all qcom options with the actual parameters * Group arrays & strings based on the option Change-Id: I092ce765013e7a80a2928df8e7d1b7e7bfd67905 --- res/values/arrays.xml | 33 -- res/values/qcomarrays.xml | 778 ++++++++++++++++++++------------------ res/values/qcomstrings.xml | 923 +++++++++++++++------------------------------ res/values/strings.xml | 30 -- 4 files changed, 705 insertions(+), 1059 deletions(-) (limited to 'res/values') diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 1d5ef0604..00088471a 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -62,17 +62,6 @@ 2 - - - @string/pref_camera_savepath_entry_0 - @string/pref_camera_savepath_entry_1 - - - - 0 - 1 - - @@ -778,26 +767,4 @@ @string/pref_camera_countdown_label_fifteen - - - @string/pref_camera_video_rotation_entry_0 - @string/pref_camera_video_rotation_entry_90 - @string/pref_camera_video_rotation_entry_180 - @string/pref_camera_video_rotation_entry_270 - - - - @string/pref_camera_video_rotation_label_0 - @string/pref_camera_video_rotation_label_90 - @string/pref_camera_video_rotation_label_180 - @string/pref_camera_video_rotation_label_270 - - - - 0 - 90 - 180 - 270 - - diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index f4c7caa0a..fe258868e 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -1,5 +1,7 @@ + - - + + + @string/pref_camera_powermode_entry_lp @string/pref_camera_powermode_entry_np - @string/pref_camera_powermode_value_lp - @string/pref_camera_powermode_value_np + Low_Power + Normal_Power - - + + @string/pref_camera_picture_format_entry_jpeg @string/pref_camera_picture_format_entry_raw @string/pref_camera_picture_format_entry_raw_yuv_422_sp @@ -104,81 +107,82 @@ @string/pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12rggb @string/pref_camera_picture_format_entry_raw_bayer_ideal_plain16_12bggr - - @string/pref_camera_picture_format_value_jpeg - @string/pref_camera_picture_format_value_raw - @string/pref_camera_picture_format_value_raw_yuv_422_sp - @string/pref_camera_picture_format_value_raw_yuv_8bit_yuyv - @string/pref_camera_picture_format_value_raw_yuv_8bit_yvyu - @string/pref_camera_picture_format_value_raw_yuv_8bit_uyvy - @string/pref_camera_picture_format_value_raw_yuv_8bit_vyuy - @string/pref_camera_picture_format_value_raw_bayer_qcom_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_qcom_8grbg - @string/pref_camera_picture_format_value_raw_bayer_qcom_8rggb - @string/pref_camera_picture_format_value_raw_bayer_qcom_8bggr - @string/pref_camera_picture_format_value_raw_bayer_qcom_10gbrg - @string/pref_camera_picture_format_value_raw_bayer_qcom_10grbg - @string/pref_camera_picture_format_value_raw_bayer_qcom_10rggb - @string/pref_camera_picture_format_value_raw_bayer_qcom_10bggr - @string/pref_camera_picture_format_value_raw_bayer_qcom_12gbrg - @string/pref_camera_picture_format_value_raw_bayer_qcom_12grbg - @string/pref_camera_picture_format_value_raw_bayer_qcom_12rggb - @string/pref_camera_picture_format_value_raw_bayer_qcom_12bggr - @string/pref_camera_picture_format_value_raw_bayer_mipi_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_mipi_8grbg - @string/pref_camera_picture_format_value_raw_bayer_mipi_8rggb - @string/pref_camera_picture_format_value_raw_bayer_mipi_8bggr - @string/pref_camera_picture_format_value_raw_bayer_mipi_10gbrg - @string/pref_camera_picture_format_value_raw_bayer_mipi_10grbg - @string/pref_camera_picture_format_value_raw_bayer_mipi_10rggb - @string/pref_camera_picture_format_value_raw_bayer_mipi_10bggr - @string/pref_camera_picture_format_value_raw_bayer_mipi_12gbrg - @string/pref_camera_picture_format_value_raw_bayer_mipi_12grbg - @string/pref_camera_picture_format_value_raw_bayer_mipi_12rggb - @string/pref_camera_picture_format_value_raw_bayer_mipi_12bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_8bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_10bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_qcom_12bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_8bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_10bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_mipi_12bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain8_8bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_8bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_10bggr - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12gbrg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12grbg - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12rggb - @string/pref_camera_picture_format_value_raw_bayer_ideal_plain16_12bggr - - - + + + jpeg + raw + yuv422sp + yuv-raw8-yuyv + yuv-raw8-yvyu + yuv-raw8-uyvy + yuv-raw8-vyuy + bayer-qcom-8gbrg + bayer-qcom-8grbg + bayer-qcom-8rggb + bayer-qcom-8bgrr + bayer-qcom-10gbrg + bayer-qcom-10grbg + bayer-qcom-10rggb + bayer-qcom-10bggr + bayer-qcom-12gbrg + bayer-qcom-12grbg + bayer-qcom-12rggb + bayer-qcom-12bggr + bayer-mipi-8gbrg + bayer-mipi-8grbg + bayer-mipi-8rggb + bayer-mipi-8bggr + bayer-mipi-10gbrg + bayer-mipi-10grbg + bayer-mipi-10rggb + bayer-mipi-10bggr + bayer-mipi-12gbrg + bayer-mipi-12grbg + bayer-mipi-12rggb + bayer-mipi-12bggr + bayer-ideal-qcom-8gbrg + bayer-ideal-qcom-8grbg + bayer-ideal-qcom-8rggb + bayer-ideal-qcom-8bggr + bayer-ideal-qcom-10gbrg + bayer-ideal-qcom-10grbg + bayer-ideal-qcom-10rggb + bayer-ideal-qcom-10bggr + bayer-ideal-qcom-12gbrg + bayer-ideal-qcom-12grbg + bayer-ideal-qcom-12rggb + bayer-ideal-qcom-12bggr + bayer-ideal-mipi-8gbrg + bayer-ideal-mipi-8grbg + bayer-ideal-mipi-8rggb + bayer-ideal-mipi-8bggr + bayer-ideal-mipi-10gbrg + bayer-ideal-mipi-10grbg + bayer-ideal-mipi-10rggb + bayer-ideal-mipi-8bggr + bayer-ideal-mipi-12gbrg + bayer-ideal-mipi-12grbg + bayer-ideal-mipi-12rggb + bayer-ideal-mipi-12bggr + bayer-ideal-plain8-8gbrg + bayer-ideal-plain8-8grbg + bayer-ideal-plain8-8rggb + bayer-ideal-plain8-8bggr + bayer-ideal-plain16-8gbrg + bayer-ideal-plain16-8grbg + bayer-ideal-plain16-8rggb + bayer-ideal-plain16-8bggr + bayer-ideal-plain16-10gbrg + bayer-ideal-plain16-10grbg + bayer-ideal-plain16-10rggb + bayer-ideal-plain16-10bggr + bayer-ideal-plain16-12gbrg + bayer-ideal-plain16-12grbg + bayer-ideal-plain16-12rggb + bayer-ideal-plain16-12bggr + + + @string/pref_camera_jpegquality_entry_0 @string/pref_camera_jpegquality_entry_1 @@ -197,8 +201,8 @@ 100 - - + + 48 38 31 @@ -207,7 +211,7 @@ 6 - + @string/pref_camera_coloreffect_entry_none @string/pref_camera_coloreffect_entry_mono @@ -233,31 +237,6 @@ @string/pref_camera_coloreffect_entry_cartoonize - - @drawable/thumb_filter_nofilter - @drawable/thumb_filter_monochrome - @drawable/thumb_filter_sepia - @drawable/thumb_filter_negative - @drawable/thumb_filter_solarize - @drawable/thumb_filter_posterize - @drawable/thumb_filter_aqua - @drawable/thumb_filter_emboss - @drawable/thumb_filter_sketch - @drawable/thumb_filter_neon - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - none mono @@ -283,56 +262,77 @@ cartoonize - - - @string/pref_camera_ae_bracket_hdr_entry_off - @string/pref_camera_ae_bracket_hdr_entry_on + + @drawable/thumb_filter_nofilter + @drawable/thumb_filter_monochrome + @drawable/thumb_filter_sepia + @drawable/thumb_filter_negative + @drawable/thumb_filter_solarize + @drawable/thumb_filter_posterize + @drawable/thumb_filter_aqua + @drawable/thumb_filter_emboss + @drawable/thumb_filter_sketch + @drawable/thumb_filter_neon + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + @string/setting_off + @string/setting_on - - + Off AE-Bracket - - - @string/pref_camera_touchafaec_entry_off - @string/pref_camera_touchafaec_entry_on + + + @string/setting_off + @string/setting_on - - + touch-off touch-on - - - @string/pref_camera_dis_entry_off - @string/pref_camera_dis_entry_on + + + @string/setting_off + @string/setting_on - - - @string/pref_camera_dis_value_disable - @string/pref_camera_dis_value_enable + + disable + enable - - - @string/pref_camera_facerc_entry_off - @string/pref_camera_facerc_entry_on + + + @string/setting_off + @string/setting_on - - + off on - + - - + + @string/pref_camera_sharpness_entry_level0 @string/pref_camera_sharpness_entry_level1 @string/pref_camera_sharpness_entry_level2 @@ -342,8 +342,18 @@ @string/pref_camera_sharpness_entry_level6 - - + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + + + + @string/pref_camera_contrast_entry_level0 @string/pref_camera_contrast_entry_level1 @string/pref_camera_contrast_entry_level2 @@ -357,8 +367,8 @@ @string/pref_camera_contrast_entry_level10 - - + + @string/pref_camera_saturation_entry_level0 @string/pref_camera_saturation_entry_level1 @string/pref_camera_saturation_entry_level2 @@ -372,19 +382,8 @@ @string/pref_camera_saturation_entry_level10 - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - - - + 0 1 2 @@ -398,94 +397,91 @@ 10 - - - @string/pref_camera_iso_entry_auto - @string/pref_camera_iso_entry_isodeblur - @string/pref_camera_iso_entry_iso100 - @string/pref_camera_iso_entry_iso200 - @string/pref_camera_iso_entry_iso400 - @string/pref_camera_iso_entry_iso800 - @string/pref_camera_iso_entry_iso1600 - - - - - @string/pref_camera_iso_value_auto - @string/pref_camera_iso_value_isodeblur - @string/pref_camera_iso_value_iso100 - @string/pref_camera_iso_value_iso200 - @string/pref_camera_iso_value_iso400 - @string/pref_camera_iso_value_iso800 - @string/pref_camera_iso_value_iso1600 - - - - - @string/pref_camera_antibanding_entry_0 - @string/pref_camera_antibanding_entry_1 - @string/pref_camera_antibanding_entry_2 - @string/pref_camera_antibanding_entry_3 - - - - off - 50hz - 60hz - auto - - - - - @string/pref_camera_histogram_entry_disable - @string/pref_camera_histogram_entry_enable - - - - - @string/pref_camera_hfr_entry_off - @string/pref_camera_hfr_entry_2x - @string/pref_camera_hfr_entry_3x - @string/pref_camera_hfr_entry_4x - @string/pref_camera_hfr_entry_8x - @string/pref_camera_hfr_entry_hsr_60 - @string/pref_camera_hfr_entry_hsr_90 - @string/pref_camera_hfr_entry_hsr_120 - - - - - @string/pref_camera_hfr_value_off - @string/pref_camera_hfr_value_2x - @string/pref_camera_hfr_value_3x - @string/pref_camera_hfr_value_4x - @string/pref_camera_hfr_value_8x - @string/pref_camera_hfr_value_hsr_60 - @string/pref_camera_hfr_value_hsr_90 - @string/pref_camera_hfr_value_hsr_120 - - - - - @string/pref_camera_see_more_entry_off - @string/pref_camera_see_more_entry_on - - - - @string/pref_camera_see_more_value_off - @string/pref_camera_see_more_value_on - - - - - @string/pref_camera_histogram_value_disable - @string/pref_camera_histogram_value_enable - - - - - @string/pref_camera_facedetection_entry_off - @string/pref_camera_facedetection_entry_on + + + @string/pref_camera_iso_entry_auto + @string/pref_camera_iso_entry_isodeblur + @string/pref_camera_iso_entry_iso100 + @string/pref_camera_iso_entry_iso200 + @string/pref_camera_iso_entry_iso400 + @string/pref_camera_iso_entry_iso800 + @string/pref_camera_iso_entry_iso1600 + + + + auto + ISO_HJR + ISO100 + ISO200 + ISO400 + ISO800 + ISO1600 + + + + + @string/pref_camera_antibanding_entry_0 + @string/pref_camera_antibanding_entry_1 + @string/pref_camera_antibanding_entry_2 + @string/pref_camera_antibanding_entry_3 + + + + off + 50hz + 60hz + auto + + + + + @string/pref_camera_hfr_entry_off + @string/pref_camera_hfr_entry_2x + @string/pref_camera_hfr_entry_3x + @string/pref_camera_hfr_entry_4x + @string/pref_camera_hfr_entry_8x + @string/pref_camera_hfr_entry_hsr_60 + @string/pref_camera_hfr_entry_hsr_90 + @string/pref_camera_hfr_entry_hsr_120 + + + + off + hfr60 + hfr90 + hfr120 + hfr240 + hsr60 + hsr90 + hsr120 + + + + + @string/setting_off + @string/setting_on + + + + off + on + + + + + @string/setting_off + @string/setting_on + + + + disable + enable + + + + + @string/setting_off + @string/setting_on @@ -493,41 +489,42 @@ on - + + + @string/setting_off + @string/setting_on + + denoise-off denoise-on - - @string/pref_camera_denoise_entry_off - @string/pref_camera_denoise_entry_on - - - + - @string/pref_camera_scenedetect_entry_off - @string/pref_camera_scenedetect_entry_on + @string/setting_off + @string/setting_on + off on - - - @string/pref_camera_autoexposure_entry_frameaverage - @string/pref_camera_autoexposure_entry_centerweighted - @string/pref_camera_autoexposure_entry_spotmetering - - - - - @string/pref_camera_autoexposure_value_frameaverage - @string/pref_camera_autoexposure_value_centerweighted - @string/pref_camera_autoexposure_value_spotmetering - - + + + @string/pref_camera_autoexposure_entry_frameaverage + @string/pref_camera_autoexposure_entry_centerweighted + @string/pref_camera_autoexposure_entry_spotmetering + + + + frame-average + center-weighted + spot-metering + + + @string/pref_camera_videoencoder_entry_0 @string/pref_camera_videoencoder_entry_1 @@ -542,7 +539,7 @@ h265 - + @string/pref_camera_audioencoder_entry_0 @string/pref_camera_audioencoder_entry_1 @@ -553,29 +550,29 @@ aac - - - @string/pref_camera_skinToneEnhancement_entry_enable - @string/pref_camera_skinToneEnhancement_entry_disable - - - - - @string/pref_camera_skinToneEnhancement_value_enable - @string/pref_camera_skinToneEnhancement_value_disable - - - - - @string/pref_camera_redeyereduction_entry_disable - @string/pref_camera_redeyereduction_entry_enable - - - - disable - enable - - + + + @string/setting_off + @string/setting_on + + + + disable + enable + + + + + @string/setting_off + @string/setting_on + + + + disable + enable + + + @string/pref_camera_selectablezoneaf_entry_auto @string/pref_camera_selectablezoneaf_entry_spotmetering @@ -584,13 +581,13 @@ - @string/pref_camera_selectablezoneaf_value_auto - @string/pref_camera_selectablezoneaf_value_spotmetering - @string/pref_camera_selectablezoneaf_value_centerweighted - @string/pref_camera_selectablezoneaf_value_frameaverage + auto + spot-metering + center-weighted + frame-average - + @string/pref_camera_manual_exp_entry_ISO_priority @string/pref_camera_manual_exp_entry_exptime_priority @@ -599,12 +596,13 @@ - @string/pref_camera_manual_exp_value_ISO_priority - @string/pref_camera_manual_exp_value_exptime_priority - @string/pref_camera_manual_exp_value_user_setting - @string/pref_camera_manual_exp_value_off + iso-priority + exp-time-priority + user-setting + off + @string/pref_camera_manual_wb_entry_color_temperature @string/pref_camera_manual_wb_entry_rbgb_gains @@ -612,11 +610,12 @@ - @string/pref_camera_manual_wb_value_color_temperature - @string/pref_camera_manual_wb_value_rbgb_gains - @string/pref_camera_manual_wb_value_off + color-temperature + rbgb-gains + off + @string/pref_camera_manual_focus_entry_scale_mode @string/pref_camera_manual_focus_entry_diopter_mode @@ -624,34 +623,34 @@ - @string/pref_camera_manual_focus_value_scale_mode - @string/pref_camera_manual_focus_value_diopter_mode - @string/pref_camera_manual_focus_value_off - + scale-mode + diopter-mode + off + - + - @string/pref_camera_zsl_entry_off - @string/pref_camera_zsl_entry_on + @string/setting_off + @string/setting_on - @string/pref_camera_zsl_value_off - @string/pref_camera_zsl_value_on + off + on - + - @string/pref_camera_video_hdr_entry_off - @string/pref_camera_video_hdr_entry_on + @string/setting_off + @string/setting_on - @string/pref_camera_video_hdr_value_off - @string/pref_camera_video_hdr_value_on + off + on - + @string/pref_camera_advanced_feature_entry_none @string/pref_camera_advanced_feature_entry_ubifocus @@ -664,121 +663,152 @@ - @string/pref_camera_advanced_feature_value_none - @string/pref_camera_advanced_feature_value_ubifocus_on - @string/pref_camera_advanced_feature_value_refocus_on - @string/pref_camera_advanced_feature_value_chromaflash_on - @string/pref_camera_advanced_feature_value_optizoom_on - @string/pref_camera_advanced_feature_value_FSSR_on - @string/pref_camera_advanced_feature_value_trueportrait_on - @string/pref_camera_advanced_feature_value_multi_touch_focus_on + none + af-bracket-on + re-focus-on + chroma-flash-on + opti-zoom-on + FSSR-on + true-portrait-on + multi-touch-focus-on - + @string/setting_off @string/setting_on - @string/setting_off_value - @string/setting_on_value + off + on - + - @string/pref_camera_auto_hdr_entry_enable - @string/pref_camera_auto_hdr_entry_disable + @string/setting_off + @string/setting_on - @string/pref_camera_auto_hdr_value_enable - @string/pref_camera_auto_hdr_value_disable + disable + enable - + - @string/pref_camera_cds_entry_off - @string/pref_camera_cds_entry_on - @string/pref_camera_cds_entry_auto + @string/setting_off + @string/setting_on + @string/pref_camera_cds_entry_auto - @string/pref_camera_cds_value_off - @string/pref_camera_cds_value_on - @string/pref_camera_cds_value_auto + off + on + auto - + - @string/pref_camera_video_cds_entry_off - @string/pref_camera_video_cds_entry_on - @string/pref_camera_video_cds_entry_auto + @string/setting_off + @string/setting_on + @string/pref_camera_video_cds_entry_auto - @string/pref_camera_video_cds_value_off - @string/pref_camera_video_cds_value_on - @string/pref_camera_video_cds_value_auto + off + on + auto - + - @string/pref_camera_tnr_entry_disable - @string/pref_camera_tnr_entry_enable + @string/setting_off + @string/setting_on - @string/pref_camera_tnr_value_off - @string/pref_camera_tnr_value_on + off + on - + - @string/pref_camera_video_tnr_entry_disable - @string/pref_camera_video_tnr_entry_enable + @string/setting_off + @string/setting_on - @string/pref_camera_video_tnr_value_off - @string/pref_camera_video_tnr_value_on + off + on - + @string/pref_camera_hdr_mode_entry_sensor @string/pref_camera_hdr_mode_entry_multi_frame - @string/pref_hdr_mode_value_sensor - @string/pref_hdr_mode_value_multi_frame + hdr-mode-sensor + hdr-mode-multiframe - + - @string/pref_camera_hdr_need_1x_entry_false - @string/pref_camera_hdr_need_1x_entry_true + @string/setting_off + @string/setting_on - @string/pref_hdr_need_1x_value_false - @string/pref_hdr_need_1x_value_true + false + true - - @string/pref_camera_tsmakeup_entry_off - @string/pref_camera_tsmakeup_entry_on + + + + @string/pref_camera_video_rotation_entry_0 + @string/pref_camera_video_rotation_entry_90 + @string/pref_camera_video_rotation_entry_180 + @string/pref_camera_video_rotation_entry_270 - - + + 0 + 90 + 180 + 270 + + + + + @string/pref_camera_savepath_entry_0 + @string/pref_camera_savepath_entry_1 + + + + 0 + 1 + + + + + @string/setting_off + @string/setting_on + + + Off On - + + @drawable/ic_ts_makeup_off + @drawable/ic_ts_makeup_on + + - @string/pref_camera_tsmakeup_entry_off + @string/setting_off 1 2 3 @@ -800,10 +830,4 @@ 100 none - - @drawable/ic_ts_makeup_off - @drawable/ic_ts_makeup_on - - - diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index d9c2ddd32..4e3ff676c 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1,5 +1,7 @@ + - + + FWVGA @@ -36,412 +39,192 @@ QCIF - - Power Mode - - - Low_Power - Normal_Power - - - Low_Power - Normal_Power + 1920x1080 - + + Power mode Normal_Power - - frame-average - - Select Auto Exposure Mode + Low power + Normal - - Frame Average - Center Weighted - Spot Metering + + Auto exposure + frame-average - - frame-average - center-weighted - spot-metering + Center weighted + Frame average + Spot metering - - Video Encoder - - - MPEG4 - H263 - H264 - H265 - - + + Video codec h264 - - Video Encoder + MPEG4 + H263 + H264 + H265 - + + Audio codec aac - - Audio Encoder - - - AMRNB - AAC - - 10 - - - disable + AMR-NB + AAC - - Skin Tone Enhancement - - - Enable - Disable - - - enable - disable - - ZSL + + Skin tone enhancement + disable + + Zero shutter lag on - - auto - - - Selectable Zone Auto Focus - - - Auto - Spot Metering - Center Weighted - Frame Average - - - auto - spot-metering - center-weighted - frame-average - - none - - - Advanced Features - - - None - Ubi Focus - Refocus - Chroma Flash - Opti Zoom - FSSR - True Portrait - Multi-touch Focus - - - none - af-bracket-on - re-focus-on - chroma-flash-on - opti-zoom-on - FSSR-on - true-portrait-on - multi-touch-focus-on - af-bracket-off - re-focus-off - chroma-flash-off - opti-zoom-off - FSSR-off - true-portrait-off - multi-touch-focus-off - - - Manual Exposure - ISO priority - Exposure time priority - User setting - Off - - off - iso-priority - exp-time-priority - user-setting - off - - - Manual White balance - Color temperature - RBGB gains - Off - - off - color-temperature - rbgb-gains - off - - - Manual Focus - Scale mode - Diopter mode - Off - - off - scale-mode - diopter-mode - off - - - Off - On - - off - on - - - HDR is enabled, only Auto scene mode is supported - HDR is not supported in the scene mode other than Auto - - - Off - On - - off - on - - - Off - On - Auto - - off - on - auto - - - Off - On - Auto - - off - on - auto - - - Disable - Enable - - - off - on - - - Disable - Enable - - - off - on - - + + Autofocus zone + auto + + Auto + Center weighted + Frame average + Spot metering + + + Advanced features + none + + None + Ubi Focus + Refocus + Chroma Flash + Opti Zoom + FSSR + True Portrait + Multi-touch Focus + + af-bracket-on + re-focus-on + chroma-flash-on + opti-zoom-on + FSSR-on + true-portrait-on + multi-touch-focus-on + + af-bracket-off + re-focus-off + chroma-flash-off + opti-zoom-off + FSSR-off + true-portrait-off + multi-touch-focus-off + + + Manual exposure + off + + ISO priority + Exposure time priority + User setting + Off + + + Manual white balance + off + + Color temperature + RBGB gains + Off + + + Manual focus + off + + Scale mode + Diopter mode + Off + + Video HDR - off - + CDS mode - - - Video CDS mode - - on - - on + Auto - - TNR mode + + Video CDS mode + on - - Video TNR mode + Auto - + + TNR mode off - + + Video TNR mode off - - off - - - Face Detection - - - Off - On - - - disable - - - Redeye Reduction - - - Enable - Disable - - enable - - - HFR/HSR is not supported for DIS/TimeLapse/HDR - - - HFR is not supported for selected resolution - - - Unsupported video resolution for Display Image Stabilization(DIS) - - - - HSR is not supported for selected resolution - - - - Only H264 video encoding is supported when HFR is ON - - - Unsupported video resolution for this encoder type - - - Raw picture format is not supported - in zsl mode, change to JPEG - - - - AE-Bracket - - AE-Bracket - - AE-Bracket - - Off - - On - - Off - - no ae bracket support by Apps now - - - Video snapshot size lower than video size. Capping to Video size. Please select a resolution higher or equal to the current video size. - - - We do not support picture - resolution in Low Power Mode. Video size snapshot will be taken. Please - select High power mode for picture size. - - - - Only Video size snapshot supported for this resolution. - - - off - - - Video High FrameRate - - - Off - HFR 60 - HFR 90 - HFR 120 - HFR 240 - HSR 60 - HSR 90 - HSR 120 - - - off - hfr60 - hfr90 - hfr120 - hfr240 - hsr60 - hsr90 - hsr120 - - - off - - - See More - - - Off - On - - - off - on - - - Wavelet Denoise Mode - denoise-on - - - Off - On - - - auto - - - Select ISO - - - Auto - ISO Auto(HJR) - ISO100 - ISO200 - ISO400 - ISO800 - ISO1600 - - - auto - ISO_HJR - ISO100 - ISO200 - ISO400 - ISO800 - ISO1600 - - - Anti Banding - - - auto - - - Off - 50 Hz - 60 Hz - Auto - - - none - - + + Face detection + on + + + Red eye reduction + disable + + + AE bracketing + Off + + + High-framerate recording + off + + Off + Slow motion 60 FPS + Slow motion 90 FPS + Slow motion 120 FPS + Slow motion 240 FPS + High speed 60 FPS + High speed 90 FPS + High speed 120 FPS + + + See More + off + + + Denoise + denoise-off + + + ISO + auto + + Auto + Auto (HJR) + ISO100 + ISO200 + ISO400 + ISO800 + ISO1600 + + + Antibanding + auto + + Off + 50 Hz + 60 Hz + Auto + + Color effect + none - None Mono Sepia @@ -459,101 +242,67 @@ Blue tint Green tint - - touch-on - - + Touch AF/AEC + touch-on - - Off - On - - - IS - disable + + Stabilization + disable - - Off - On + + Face recognition + off - disable - enable - - - Face Recognition - - off - - - Off - On + + Sharpness + 2 - Level 0 Level 1 - Level 2(Default) + Level 2 (default) Level 3 Level 4 Level 5 Level 6 - + + Contrast + 5 + Level 0 Level 1 Level 2 Level 3 Level 4 - Level 5(Default) + Level 5 (default) Level 6 Level 7 Level 8 Level 9 Level 10 - + + Saturation + 5 + Level 0 Level 1 Level 2 Level 3 Level 4 - Level 5(Default) + Level 5 (default) Level 6 Level 7 Level 8 Level 9 Level 10 - - 2 + + Picture format + jpeg - - Sharpness - - - 5 - - - Contrast - - - 5 - - - Saturation - - - 85 - - - jpeg - - - Select Picture Format - - - Jpeg + JPEG Raw YUV422SP YUVRaw8YUYV @@ -625,216 +374,152 @@ BayerIP1612rggb BayerIP1612bggr - - jpeg - raw - yuv422sp - yuv-raw8-yuyv - yuv-raw8-yvyu - yuv-raw8-uyvy - yuv-raw8-vyuy - bayer-qcom-8gbrg - bayer-qcom-8grbg - bayer-qcom-8rggb - bayer-qcom-8bgrr - bayer-qcom-10gbrg - bayer-qcom-10grbg - bayer-qcom-10rggb - bayer-qcom-10bggr - bayer-qcom-12gbrg - bayer-qcom-12grbg - bayer-qcom-12rggb - bayer-qcom-12bggr - bayer-mipi-8gbrg - bayer-mipi-8grbg - bayer-mipi-8rggb - bayer-mipi-8bggr - bayer-mipi-10gbrg - bayer-mipi-10grbg - bayer-mipi-10rggb - bayer-mipi-10bggr - bayer-mipi-12gbrg - bayer-mipi-12grbg - bayer-mipi-12rggb - bayer-mipi-12bggr - bayer-ideal-qcom-8gbrg - bayer-ideal-qcom-8grbg - bayer-ideal-qcom-8rggb - bayer-ideal-qcom-8bggr - bayer-ideal-qcom-10gbrg - bayer-ideal-qcom-10grbg - bayer-ideal-qcom-10rggb - bayer-ideal-qcom-10bggr - bayer-ideal-qcom-12gbrg - bayer-ideal-qcom-12grbg - bayer-ideal-qcom-12rggb - bayer-ideal-qcom-12bggr - bayer-ideal-mipi-8gbrg - bayer-ideal-mipi-8grbg - bayer-ideal-mipi-8rggb - bayer-ideal-mipi-8bggr - bayer-ideal-mipi-10gbrg - bayer-ideal-mipi-10grbg - bayer-ideal-mipi-10rggb - bayer-ideal-mipi-8bggr - bayer-ideal-mipi-12gbrg - bayer-ideal-mipi-12grbg - bayer-ideal-mipi-12rggb - bayer-ideal-mipi-12bggr - bayer-ideal-plain8-8gbrg - bayer-ideal-plain8-8grbg - bayer-ideal-plain8-8rggb - bayer-ideal-plain8-8bggr - bayer-ideal-plain16-8gbrg - bayer-ideal-plain16-8grbg - bayer-ideal-plain16-8rggb - bayer-ideal-plain16-8bggr - bayer-ideal-plain16-10gbrg - bayer-ideal-plain16-10grbg - bayer-ideal-plain16-10rggb - bayer-ideal-plain16-10bggr - bayer-ideal-plain16-12gbrg - bayer-ideal-plain16-12grbg - bayer-ideal-plain16-12rggb - bayer-ideal-plain16-12bggr - + Picture quality + 85 - - Jpeg 55% - Jpeg 65% - Jpeg 75% - Jpeg 85% - Jpeg 95% - Jpeg 100% - - - disable - - - Histogram - - - Enable - Disable - - - enable - disable - - HD1080 - WXGA - HD720 - SVGA - WVGA - CIF - QCIF - - + 55% + 65% (normal) + 75% (fine) + 85% (super fine) + 95% + 100% + + + Histogram + disable + + + Auto scene detection off - - Auto Scene Detection + + Continuous shot + off - - Off - - On + + Auto HDR + disable - - Invalid video-size for time-lapse recording. + + HDR mode + hdr-mode-multiframe - 1920x1080 + Sensor HDR + Multi-frame HDR - - off - Continuous Shot - run out of memory, canceling longshot + + HDR needs 1x frame + true - - Flash is not supported in AE-Bracket Mode + + Video rotation + 0 - - AUTO HDR - - disable + 0 degrees + 90 degrees + 180 degrees + 270 degrees - - Enable - Disable - enable - disable + + Storage location + 0 - - Internal storage space is not enough - switched save path to SD card + Internal storage + SD card - hdr-mode-multiframe + + Beautification + Off + 60 - - HDR Mode + Custom + Whiten + Soften - - Sensor HDR - Multi-frame HDR + To use beautification, face detection must be disabled + Continue + Cancel + + - - hdr-mode-sensor - hdr-mode-multiframe + + Launch camera - - @string/pref_hdr_need_1x_value_true + All in focus - - HDR need 1x frame + To re-focus last photo, tap here - - @string/setting_off - @string/setting_on + - - false - true + + High-framerate recording is not supported when using Stabilization/Time lapse/HDR. - - 0 + + Slow motion mode is not supported for the selected video size. Select a lower video size + + + Stabilization is not supported for the selected video size. Select a lower video size + + + High speed mode is not supported for the selected video size. Select a lower video size + + + Only H264 video encoding is supported when HFR is ON - - Video Rotation + + Unsupported video resolution for this encoder type - - VIDEO ROTATION + + Raw picture format is not supported in Zero shutter lag mode. Select JPEG - - 0 - 90 - 180 - 270 + Running out of memory, cancelling continuous shot + + + Flash is not supported in AE bracketing mode + + + Internal storage space is not enough, switched storage location to SD card - There is no map app for show location. + There is no map app for show location - - Advance features are not supported in continuous shot mode + Advanced features are not supported in continuous shot mode - - Continuous shot is not supported when advance features are enabled + Continuous shot is not supported when advanced features are enabled - - Launch camera - Beautification - On - Off - Off - 60 - Custom - Whiten - Soften - Warning - The beautification must turn on Face Detection, Continue or Quit? - Continue - Quit - - All in Focus - + + Enabling HDR will disable continuous shot + + + Enabling advanced capture will disable continuous shot + + + Enableing 4k video size will disable Stabilization + + + SeeMore cannot be enabled during 4k video + + off + off + + off + off + + scale-mode + diopter-mode + + color-temperature + rbgb-gains + + iso-priority + exp-time-priority + user-setting + + off + on + + disable + diff --git a/res/values/strings.xml b/res/values/strings.xml index 8ba8295df..1734f6d41 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -219,12 +219,6 @@ Beep during countdown - - Storage Position - 0 - Phone - SD Card - Off @@ -410,19 +404,6 @@ Not selectable in scene mode. - - Enable HDR will disable Continuous Shot. - - - - Enable Advanced Capture will disable Continuous Shot. - - - Enable 4k video quality will disable IS. - - - SeeMore cannot be enabled during 4k video. - Exposure 0 @@ -696,15 +677,4 @@ CHAR LIMIT = NONE] --> Setting wallpaper - - - - 0 - 90 - 180 - 270 - - %d left - - To re-focus last photo, tap here -- cgit v1.2.3