summaryrefslogtreecommitdiffstats
path: root/res/values/arrays.xml
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-01 11:23:07 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-01 11:23:07 -0800
commit29f83f75cd173020ca978578e9a41bec01059572 (patch)
treeb8ce0dce2ecc675e4e0aea1337095840d8ddc042 /res/values/arrays.xml
parent8fec397630043de04f3f963a48b9b9c931617bd8 (diff)
parent7352e9149e6193ce4d02b5a79f08a5c217d0ced8 (diff)
downloadandroid_packages_apps_Snap-29f83f75cd173020ca978578e9a41bec01059572.tar.gz
android_packages_apps_Snap-29f83f75cd173020ca978578e9a41bec01059572.tar.bz2
android_packages_apps_Snap-29f83f75cd173020ca978578e9a41bec01059572.zip
Merge "SnapdragonCamera: Add 16MP and 20MP picture resolutions"
Diffstat (limited to 'res/values/arrays.xml')
-rw-r--r--res/values/arrays.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c288c066a..408d5064d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -173,6 +173,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>
@@ -205,6 +207,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>