summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-05-24 12:24:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-24 12:24:30 -0700
commit5e6613eed7cff25d4685ddd48be735682d27a7b5 (patch)
treeea1e17252291a0cd75db3ec8f12c7cf1d213ba5a
parente46c3a0cac1ec6ab707bf74b85e91c488488de8a (diff)
parentba0c64720ea43807d8995cc6ec3cd142c427741a (diff)
downloadandroid_packages_apps_Snap-5e6613eed7cff25d4685ddd48be735682d27a7b5.tar.gz
android_packages_apps_Snap-5e6613eed7cff25d4685ddd48be735682d27a7b5.tar.bz2
android_packages_apps_Snap-5e6613eed7cff25d4685ddd48be735682d27a7b5.zip
am 461e101f: Add 13MP resolution
* commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/strings.xml2
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1cae7bce1..f40c6efbc 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -154,6 +154,7 @@
<!-- Camera Preferences Picture size dialog box entries -->
<string-array name="pref_camera_picturesize_entries" translatable="false">
+ <item>@string/pref_camera_picturesize_entry_13mp</item>
<item>@string/pref_camera_picturesize_entry_8mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
@@ -170,6 +171,7 @@
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>4128x3096</item>
<item>3264x2448</item>
<item>2592x1944</item>
<item>2592x1936</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1c2e317f..0ec4da624 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -672,6 +672,8 @@
<!-- Settings screen, Picture size title -->
<string name="pref_camera_picturesize_title">Picture size</string>
+ <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_13mp">13M pixels</string>
<!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
<!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->