diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-19 02:59:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-19 02:59:20 -0800 |
| commit | 4f590dbd7c49747d95bbd476a1eab6fff7366c31 (patch) | |
| tree | 7ca1db1c5517c44979446d031f5eb217a39999c7 | |
| parent | 87929f68048c7fe91963c1b0a05b32c8cc0022d2 (diff) | |
| parent | a84cc84f7e25fac6e153ec7b821f6010484d5aed (diff) | |
| download | android_packages_apps_Snap-4f590dbd7c49747d95bbd476a1eab6fff7366c31.tar.gz android_packages_apps_Snap-4f590dbd7c49747d95bbd476a1eab6fff7366c31.tar.bz2 android_packages_apps_Snap-4f590dbd7c49747d95bbd476a1eab6fff7366c31.zip | |
Merge "SnapdragonCamera: Add 16MP and 20MP picture resolutions"
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 71b4afccd..f82c712a9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -186,6 +186,8 @@ <!-- 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_16mp</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> @@ -218,6 +220,8 @@ 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>4608x3456</item> <item>4160x3120</item> <item>4000x3000</item> <item>3840x2160</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d3aee027..290f13588 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -272,7 +272,10 @@ <!-- Settings screen, Picture size title --> <string name="pref_camera_picturesize_title">Picture size</string> - + <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=20] --> + <string name="pref_camera_picturesize_entry_20mp">20M 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 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] --> |