diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 142 | ||||
| -rwxr-xr-x | res/values/camera2arrays.xml | 79 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 16 | ||||
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 41 |
6 files changed, 19 insertions, 272 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ec7130af6..2a39275d4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -28,7 +28,7 @@ <item>@string/pref_video_quality_entry_vga</item> <item>@string/pref_video_quality_entry_cif</item> <item>@string/pref_video_quality_entry_qvga</item> - </string-array> + </string-array> <string-array name="pref_video_quality_entryvalues" translatable="false"> <item>4096x2160</item> <item>3840x2160</item> @@ -167,146 +167,6 @@ <item>@string/time_lapse_hours</item> </string-array> - <!-- Camera Preferences Picture size dialog box entries --> - <string-array name="pref_camera_picturesize_entries" translatable="false"> - <item>@string/pref_camera_picturesize_entry_24mp</item> - <item>@string/pref_camera_picturesize_entry_21mp</item> - <item>@string/pref_camera_picturesize_entry_16mp</item> - <item>@string/pref_camera_picturesize_entry_16mp_wide</item> - <item>@string/pref_camera_picturesize_entry_13mp</item> - <item>@string/pref_camera_picturesize_entry_12mp</item> - <item>@string/pref_camera_picturesize_entry_8mp</item> - <item>@string/pref_camera_picturesize_entry_8mp</item> - <item>@string/pref_camera_picturesize_entry_square</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_4mp_wide</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_1920x1080</item> - <item>@string/pref_camera_picturesize_entry_2mp</item> - <item>@string/pref_camera_picturesize_entry_2mp_wide</item> - <item>@string/pref_camera_picturesize_entry_1_5mp</item> - <item>@string/pref_camera_picturesize_entry_1_3mp</item> - <item>@string/pref_camera_picturesize_entry_1280x768</item> - <item>@string/pref_camera_picturesize_entry_1280x720</item> - <item>@string/pref_camera_picturesize_entry_1280x400</item> - <item>@string/pref_camera_picturesize_entry_1mp</item> - <item>@string/pref_camera_picturesize_entry_800x600</item> - <item>@string/pref_camera_picturesize_entry_800x480</item> - <item>960 x 720</item> - <item>720 x 480</item> - <item>@string/pref_camera_picturesize_entry_vga</item> - <item>@string/pref_camera_picturesize_entry_352x288</item> - <item>@string/pref_camera_picturesize_entry_qvga</item> - </string-array> - <!-- When launching the camera app first time, we will set the picture - size to the first one in the list that is also supported by the - driver --> - <string-array name="pref_camera_picturesize_entryvalues" translatable="false"> - <item>5656x4242</item> - <item>5344x4008</item> - <item>4608x3456</item> - <item>5312x2988</item> - <item>4160x3120</item> - <item>4000x3000</item> - <item>3840x2160</item> - <item>3264x2448</item> - <item>2976x2976</item> - <item>2592x1944</item> - <item>2592x1936</item> - <item>2560x1920</item> - <item>2688x1512</item> - <item>2048x1536</item> - <item>2048x1520</item> - <item>1920x1080</item> - <item>1600x1200</item> - <item>1920x1088</item> - <item>1440x1080</item> - <item>1280x960</item> - <item>1280x768</item> - <item>1280x720</item> - <item>1280x400</item> - <item>1024x768</item> - <item>800x600</item> - <item>800x480</item> - <item>960x720</item> - <item>720x480</item> - <item>640x480</item> - <item>352x288</item> - <item>320x240</item> - </string-array> - - <!-- Camera Preferences video snapshot size dialog box entries --> - <string-array name="pref_camera_video_snapsize_entries" translatable="false"> - <item>Auto</item> - <item>@string/pref_camera_picturesize_entry_21mp</item> - <item>@string/pref_camera_picturesize_entry_16mp</item> - <item>@string/pref_camera_picturesize_entry_16mp_wide</item> - <item>@string/pref_camera_picturesize_entry_13mp</item> - <item>@string/pref_camera_picturesize_entry_12mp</item> - <item>@string/pref_camera_picturesize_entry_8mp</item> - <item>@string/pref_camera_picturesize_entry_8mp</item> - <item>@string/pref_camera_picturesize_entry_square</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_4mp_wide</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_1920x1080</item> - <item>@string/pref_camera_picturesize_entry_2mp</item> - <item>@string/pref_camera_picturesize_entry_2mp_wide</item> - <item>@string/pref_camera_picturesize_entry_1_5mp</item> - <item>@string/pref_camera_picturesize_entry_1_3mp</item> - <item>@string/pref_camera_picturesize_entry_1280x768</item> - <item>@string/pref_camera_picturesize_entry_1280x720</item> - <item>@string/pref_camera_picturesize_entry_1mp</item> - <item>@string/pref_camera_picturesize_entry_800x600</item> - <item>@string/pref_camera_picturesize_entry_800x480</item> - <item>960 x 720</item> - <item>720 x 480</item> - <item>@string/pref_camera_picturesize_entry_vga</item> - <item>@string/pref_camera_picturesize_entry_352x288</item> - <item>@string/pref_camera_picturesize_entry_qvga</item> - </string-array> - - <!-- default is auto, which calculates largest snapshot - size with same aspect ratio as preview. --> - <string-array name="pref_camera_video_snapsize_entryvalues" translatable="false"> - <item>auto</item> - <item>5344x4008</item> - <item>4608x3456</item> - <item>5312x2988</item> - <item>4160x3120</item> - <item>4000x3000</item> - <item>3840x2160</item> - <item>3264x2448</item> - <item>2976x2976</item> - <item>2592x1944</item> - <item>2592x1936</item> - <item>2560x1920</item> - <item>2688x1512</item> - <item>2048x1536</item> - <item>2048x1520</item> - <item>1920x1080</item> - <item>1600x1200</item> - <item>1920x1088</item> - <item>1440x1080</item> - <item>1280x960</item> - <item>1280x768</item> - <item>1280x720</item> - <item>1024x768</item> - <item>800x600</item> - <item>800x480</item> - <item>960x720</item> - <item>720x480</item> - <item>640x480</item> - <item>352x288</item> - <item>320x240</item> - </string-array> - <!-- Camera Preferences focus mode dialog box entries --> <string-array name="pref_camera_focusmode_entries" translatable="false"> <item>@string/pref_camera_focusmode_entry_auto</item> diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index f28b2d682..066c34c31 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -433,85 +433,6 @@ <item>1</item> </string-array> - <!-- Camera Preferences Picture size dialog box entries --> - <string-array name="pref_camera2_picturesize_entries" translatable="false"> - <item>@string/pref_camera_picturesize_entry_48mp</item> - <item>@string/pref_camera_picturesize_entry_32mp</item> - <item>@string/pref_camera_picturesize_entry_24mp</item> - <item>@string/pref_camera_picturesize_entry_21mp</item> - <item>5184 x 3880</item> - <item>@string/pref_camera_picturesize_entry_16mp</item> - <item>@string/pref_camera_picturesize_entry_16mp_wide</item> - <item>@string/pref_camera_picturesize_entry_13mp</item> - <item>4208 x 3120</item> - <item>@string/pref_camera_picturesize_entry_12mp</item> - <item>@string/pref_camera_picturesize_entry_8mp_wide</item> - <item>@string/pref_camera_picturesize_entry_8mp</item> - <item>@string/pref_camera_picturesize_entry_square</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_4mp_wide</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_3mp</item> - <item>@string/pref_camera_picturesize_entry_1920x1080</item> - <item>@string/pref_camera_picturesize_entry_2mp</item> - <item>@string/pref_camera_picturesize_entry_2mp_wide</item> - <item>@string/pref_camera_picturesize_entry_1_5mp</item> - <item>@string/pref_camera_picturesize_entry_1_3mp</item> - <item>@string/pref_camera_picturesize_entry_1280x768</item> - <item>@string/pref_camera_picturesize_entry_1280x720</item> - <item>@string/pref_camera_picturesize_entry_1280x400</item> - <item>@string/pref_camera_picturesize_entry_1mp</item> - <item>@string/pref_camera_picturesize_entry_800x600</item> - <item>@string/pref_camera_picturesize_entry_800x480</item> - <item>@string/pref_camera_picturesize_entry_960x720</item> - <item>@string/pref_camera_picturesize_entry_720x480</item> - <item>@string/pref_camera_picturesize_entry_vga</item> - <item>@string/pref_camera_picturesize_entry_352x288</item> - <item>@string/pref_camera_picturesize_entry_qvga</item> - </string-array> - <!-- When launching the camera app first time, we will set the picture - size to the first one in the list that is also supported by the - driver --> - <string-array name="pref_camera2_picturesize_entryvalues" translatable="false"> - <item>8000x6000</item> - <item>6560x4928</item> - <item>5656x4242</item> - <item>5344x4008</item> - <item>5184x3880</item> - <item>4608x3456</item> - <item>5312x2988</item> - <item>4160x3120</item> - <item>4208x3120</item> - <item>4000x3000</item> - <item>3840x2160</item> - <item>3264x2448</item> - <item>2976x2976</item> - <item>2592x1944</item> - <item>2592x1936</item> - <item>2560x1920</item> - <item>2688x1512</item> - <item>2048x1536</item> - <item>2048x1520</item> - <item>1920x1080</item> - <item>1600x1200</item> - <item>1920x1088</item> - <item>1440x1080</item> - <item>1280x960</item> - <item>1280x768</item> - <item>1280x720</item> - <item>1280x400</item> - <item>1024x768</item> - <item>800x600</item> - <item>800x480</item> - <item>960x720</item> - <item>720x480</item> - <item>640x480</item> - <item>352x288</item> - <item>320x240</item> - </string-array> - <string-array name="pref_camera2_picture_format_entries" translatable="false"> <item>@string/pref_camera2_picture_format_entry_0</item> <item>@string/pref_camera2_picture_format_entry_1</item> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 2908dba18..8ce5ba208 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -16,6 +16,22 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- common aspect ratios --> + <string name="pref_camera_aspectratio_43" translatable="false">4:3</string> + <string name="pref_camera_aspectratio_32" translatable="false">3:2</string> + <string name="pref_camera_aspectratio_1610" translatable="false">16:10</string> + <string name="pref_camera_aspectratio_53" translatable="false">5:3</string> + <string name="pref_camera_aspectratio_169" translatable="false">16:9</string> + <string name="pref_camera_aspectratio_11" translatable="false">1:1</string> + <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" --> + <string name="pref_camera_aspectratio_wide">Wide</string> + + <!-- Format for entries in the picture size menu. Parameter one is aspect ratio, + parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels" + NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two) + will be multiplied by 100 as those languages want to count by ten thousands --> + <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string> + <!-- Settings screen, scene mode --> <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string> <string name="pref_camera_scenemode_entry_aqua">Aqua</string> diff --git a/res/values/config.xml b/res/values/config.xml index f0b611fe6..023ce2dd4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -68,4 +68,6 @@ will be enabled ONLY for these scenemodes and disabled for others. --> <string-array name="longshot_scenemodes"></string-array> + <!-- Minimum picture size (in pixel) to include in selection list --> + <integer name="minimum_picture_size">900000</integer> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 70bb5c388..a9bc02a6b 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -809,17 +809,6 @@ <string name="pref_camera_histogram_value_enable">enable</string> <string name="pref_camera_histogram_value_disable">disable</string> - <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string> - <string name="pref_camera_picturesize_entry_1280x768">WXGA</string> - <string name="pref_camera_picturesize_entry_1280x720">HD720</string> - <string name="pref_camera_picturesize_entry_1280x400">1280 x 400</string> - <string name="pref_camera_picturesize_entry_800x600">SVGA</string> - <string name="pref_camera_picturesize_entry_800x480">WVGA</string> - <string name="pref_camera_picturesize_entry_960x720">960 x 720</string> - <string name="pref_camera_picturesize_entry_720x480">720 x 480</string> - <string name="pref_camera_picturesize_entry_352x288">CIF</string> - <string name="pref_camera_picturesize_entry_176x144">QCIF</string> - <!-- Default auto scene detection setting. --> <string name="pref_camera_scenedetect_default" translatable="false">off</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 98b5f5b7c..d3e1cb5a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -273,47 +273,6 @@ <!-- Settings screen, Picture size title --> <string name="pref_camera_picturesize_title">Picture size</string> - <!-- Settings screen, dialog choice for 48 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_48mp">48M pixels</string> - <!-- Settings screen, dialog choice for 32 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_32mp">32M pixels</string> - <!-- Settings screen, dialog choice for 24 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_24mp">24M pixels</string> - <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_21mp">21M pixels</string> - <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_16mp">16M pixels</string> - <!-- Settings screen, dialog choice for 16 megapixels wide picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_16mp_wide">16M pixels (16:9)</string> - <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_13mp">13M pixels</string> - <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_12mp">12M pixels</string> - <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_8mp">8M pixels</string> - <string name="pref_camera_picturesize_entry_8mp_wide">8M pixels (16:9)</string> - <!-- Settings screen, dialog choice for square picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_square">Square (1:1)</string> - <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_5mp">5M pixels</string> - <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_4mp_wide">4M pixels (16:9)</string> - <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_3mp">3M pixels</string> - <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_2mp">2M pixels</string> - <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string> - <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string> - <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string> - <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_1mp">1M pixels</string> - <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_vga">VGA</string> - <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_qvga">QVGA</string> <!-- Settings screen, Focus mode title --> <string name="pref_camera_focusmode_title">Focus mode</string> |