diff options
author | Steve Kondik <shade@chemlab.org> | 2013-12-07 07:12:04 -0800 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:01 +0300 |
commit | 2c83037f8c1b4296c9ad503a17dc89e5b617ea80 (patch) | |
tree | 38266a66fd8715e85164c62a029683da9931474b /res/values/arrays.xml | |
parent | ffe842eb13dbc9b4da171c5bca11a3b3b2c8083d (diff) | |
download | android_packages_apps_Snap-2c83037f8c1b4296c9ad503a17dc89e5b617ea80.tar.gz android_packages_apps_Snap-2c83037f8c1b4296c9ad503a17dc89e5b617ea80.tar.bz2 android_packages_apps_Snap-2c83037f8c1b4296c9ad503a17dc89e5b617ea80.zip |
camera: Add all resolutions, focus modes, scene modes, and color effects.
Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r-- | res/values/arrays.xml | 194 |
1 files changed, 160 insertions, 34 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index a4cc51928..b2f277eb3 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -175,86 +175,133 @@ <!-- Camera Preferences Picture size dialog box entries --> <string-array name="pref_camera_picturesize_entries" translatable="false"> - <item>@string/pref_camera_picturesize_entry_20mp</item> + <item>@string/pref_camera_picturesize_entry_20_7mp</item> + <item>@string/pref_camera_picturesize_entry_18mp</item> <item>@string/pref_camera_picturesize_entry_16mp</item> + <item>@string/pref_camera_picturesize_entry_15_9mp_wide</item> <item>@string/pref_camera_picturesize_entry_13mp</item> + <item>@string/pref_camera_picturesize_entry_13mp</item> + <item>@string/pref_camera_picturesize_entry_12_8mp</item> + <item>@string/pref_camera_picturesize_entry_12_7mp</item> <item>@string/pref_camera_picturesize_entry_12mp</item> + <item>@string/pref_camera_picturesize_entry_11_9mp</item> + <item>@string/pref_camera_picturesize_entry_11_5mp</item> + <item>@string/pref_camera_picturesize_entry_10_4mp</item> + <item>@string/pref_camera_picturesize_entry_10mp</item> + <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item> + <item>@string/pref_camera_picturesize_entry_9mp</item> + <item>@string/pref_camera_picturesize_entry_8_2mp_wide</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_7_7mp</item> + <item>@string/pref_camera_picturesize_entry_6_4mp</item> + <item>@string/pref_camera_picturesize_entry_6mp_wide</item> + <item>@string/pref_camera_picturesize_entry_6mp_wide</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_4_5mp</item> <item>@string/pref_camera_picturesize_entry_4mp_wide</item> + <item>@string/pref_camera_picturesize_entry_4mp</item> + <item>@string/pref_camera_picturesize_entry_3_7mp_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_2_5mp</item> + <item>@string/pref_camera_picturesize_entry_2_1mp_wide</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_9mp</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_wxga</item> + <item>@string/pref_camera_picturesize_entry_xga</item> + <item>@string/pref_camera_picturesize_entry_svga</item> + <item>@string/pref_camera_picturesize_entry_wvga</item> <item>@string/pref_camera_picturesize_entry_vga</item> - <item>@string/pref_camera_picturesize_entry_352x288</item> + <item>@string/pref_camera_picturesize_entry_nhd_wide</item> + <item>@string/pref_camera_picturesize_entry_wqvga</item> <item>@string/pref_camera_picturesize_entry_qvga</item> - <item>@string/pref_camera_picturesize_entry_176x144</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>5248x3936</item> + <item>4992x3744</item> <item>4608x3456</item> + <item>5312x2988</item> + <item>4208x3120</item> <item>4160x3120</item> + <item>4128x3096</item> + <item>4128x3088</item> <item>4000x3000</item> + <item>3984x2988</item> + <item>3920x2940</item> + <item>4128x2528</item> + <item>4320x2432</item> + <item>4160x2340</item> + <item>3920x2204</item> <item>3840x2160</item> <item>3264x2448</item> - <item>2976x2976</item> + <item>3200x2400</item> + <item>3264x1968</item> + <item>3264x1840</item> + <item>3264x1836</item> <item>2592x1944</item> <item>2592x1936</item> <item>2560x1920</item> - <item>2688x1512</item> + <item>2592x1728</item> + <item>2688x1520</item> + <item>2560x1536</item> + <item>2560x1440</item> <item>2048x1536</item> <item>2048x1520</item> + <item>2048x1232</item> <item>1920x1080</item> <item>1600x1200</item> <item>1920x1088</item> - <item>1440x1080</item> + <item>1392x1392</item> + <item>1600x960</item> <item>1280x960</item> - <item>1280x768</item> <item>1280x720</item> <item>1024x768</item> + <item>1024x600</item> <item>800x600</item> <item>800x480</item> - <item>960x720</item> - <item>720x480</item> <item>640x480</item> - <item>352x288</item> + <item>640x360</item> + <item>480x320</item> <item>320x240</item> - <item>176x144</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> + <item>@string/pref_camera_focusmode_entry_continuous</item> + <item>@string/pref_camera_focusmode_entry_extended</item> + <item>@string/pref_camera_focusmode_entry_facedetect</item> + <item>@string/pref_camera_focusmode_entry_facepriority</item> + <item>@string/pref_camera_focusmode_entry_fixed</item> <item>@string/pref_camera_focusmode_entry_infinity</item> <item>@string/pref_camera_focusmode_entry_macro</item> <item>@string/pref_camera_focusmode_entry_normal</item> - <item>@string/pref_camera_focusmode_entry_continuous</item> + <item>@string/pref_camera_focusmode_entry_portrait</item> + <item>@string/pref_camera_focusmode_entry_hyperfocal</item> </string-array> <string-array name="pref_camera_focusmode_entryvalues" translatable="false"> <item>auto</item> + <item>continuous-picture</item> + <item>extended</item> + <item>facedetect</item> + <item>face-priority</item> + <item>fixed</item> <item>infinity</item> <item>macro</item> <item>normal</item> - <item>continuous-picture</item> + <item>portrait</item> + <item>hyperfocal</item> </string-array> <string-array name="pref_camera_focusmode_labels" translatable="false"> @@ -399,16 +446,55 @@ <item>@string/pref_camera_scenemode_entry_auto</item> <item>@string/pref_camera_scenemode_entry_hdr</item> <item>@string/pref_camera_scenemode_entry_refocus</item> - <item>@string/pref_camera_scenemode_entry_portrait</item> - <item>@string/pref_camera_scenemode_entry_landscape</item> - <item>@string/pref_camera_scenemode_entry_sports</item> - <item>@string/pref_camera_scenemode_entry_flowers</item> + <item>@string/pref_camera_scenemode_entry_action</item> + <item>@string/pref_camera_scenemode_entry_antimotionblur</item> + <item>@string/pref_camera_scenemode_entry_aqua</item> + <item>@string/pref_camera_scenemode_entry_ar</item> + <item>@string/pref_camera_scenemode_entry_baby</item> + <item>@string/pref_camera_scenemode_entry_backgroundblur</item> <item>@string/pref_camera_scenemode_entry_backlight</item> + <item>@string/pref_camera_scenemode_entry_backlight</item> + <item>@string/pref_camera_scenemode_entry_backlightportrait</item> + <item>@string/pref_camera_scenemode_entry_backlightportrait</item> + <item>@string/pref_camera_scenemode_entry_barcode</item> + <item>@string/pref_camera_scenemode_entry_beach</item> + <item>@string/pref_camera_scenemode_entry_beauty</item> <item>@string/pref_camera_scenemode_entry_candlelight</item> - <item>@string/pref_camera_scenemode_entry_sunset</item> + <item>@string/pref_camera_scenemode_entry_cine</item> + <item>@string/pref_camera_scenemode_entry_closeup</item> + <item>@string/pref_camera_scenemode_entry_dark</item> + <item>@string/pref_camera_scenemode_entry_dish</item> + <item>@string/pref_camera_scenemode_entry_duskdawn</item> + <item>@string/pref_camera_scenemode_entry_document</item> + <item>@string/pref_camera_scenemode_entry_fallcolor</item> + <item>@string/pref_camera_scenemode_entry_fireworks</item> + <item>@string/pref_camera_scenemode_entry_flowers</item> + <item>@string/pref_camera_scenemode_entry_handheldtwilight</item> + <item>@string/pref_camera_scenemode_entry_highsensitivity</item> + <item>@string/pref_camera_scenemode_entry_indoor</item> + <item>@string/pref_camera_scenemode_entry_landscape</item> + <item>@string/pref_camera_focusmode_entry_macro</item> + <item>@string/pref_camera_scenemode_entry_mix_illuminant</item> + <item>@string/pref_camera_scenemode_entry_mood</item> <item>@string/pref_camera_scenemode_entry_night</item> - <item>@string/pref_camera_scenemode_entry_beach</item> + <item>@string/pref_camera_scenemode_entry_nightportrait</item> + <item>@string/pref_camera_scenemode_entry_nightportrait</item> + <item>@string/pref_camera_scenemode_entry_nightindoor</item> + <item>@string/pref_camera_scenemode_entry_oldfilm</item> + <item>@string/pref_camera_scenemode_entry_party</item> + <item>@string/pref_camera_scenemode_entry_pet</item> + <item>@string/pref_camera_scenemode_entry_portrait</item> <item>@string/pref_camera_scenemode_entry_snow</item> + <item>@string/pref_camera_scenemode_entry_softskin</item> + <item>@string/pref_camera_scenemode_entry_sports</item> + <item>@string/pref_camera_scenemode_entry_spotlight</item> + <item>@string/pref_camera_scenemode_entry_steadyphoto</item> + <item>@string/pref_camera_scenemode_entry_sunset</item> + <item>@string/pref_camera_scenemode_entry_supernight</item> + <item>@string/pref_camera_scenemode_entry_sweepstitch</item> + <item>@string/pref_camera_scenemode_entry_text</item> + <item>@string/pref_camera_scenemode_entry_theatre</item> + <item>@string/pref_camera_scenemode_entry_whiteboard</item> </string-array> <array name="scenemode_thumbnails" translatable="false"> @@ -447,16 +533,55 @@ <item>auto</item> <item>hdr</item> <item>@string/pref_camera_advanced_feature_value_refocus_on</item> - <item>portrait</item> - <item>landscape</item> - <item>sports</item> - <item>flowers</item> + <item>action</item> + <item>anti-motion-blur</item> + <item>aqua</item> + <item>AR</item> + <item>baby</item> + <item>background-blur</item> + <item>back-light</item> <item>backlight</item> + <item>backlight_portrait</item> + <item>backlight-portrait</item> + <item>barcode</item> + <item>beach</item> + <item>beauty-mode</item> <item>candlelight</item> - <item>sunset</item> + <item>cine</item> + <item>closeup</item> + <item>dark</item> + <item>dish</item> + <item>dusk-dawn</item> + <item>document</item> + <item>fall-color</item> + <item>fireworks</item> + <item>flowers</item> + <item>handheld-twilight</item> + <item>high-sensitivity</item> + <item>indoor</item> + <item>landscape</item> + <item>macro</item> + <item>mix-illuminant</item> + <item>mood</item> <item>night</item> - <item>beach</item> + <item>night-portrait</item> + <item>nightportrait</item> + <item>night-indoor</item> + <item>old-film</item> + <item>party</item> + <item>pet</item> + <item>portrait</item> <item>snow</item> + <item>soft-skin</item> + <item>sports</item> + <item>spot-light</item> + <item>steadyphoto</item> + <item>sunset</item> + <item>super-night</item> + <item>sweep-stitch</item> + <item>text</item> + <item>theatre</item> + <item>white-board</item> </string-array> <array name="camera_id_entries" translatable="false"> @@ -571,6 +696,7 @@ <!-- Default focus mode setting.--> <string-array name="pref_camera_focusmode_default_array" translatable="false"> + <item>continuous-picture</item> <item>auto</item> </string-array> |