summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-10-03 03:00:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-03 03:00:39 -0700
commit2f619da3f49e2f42019a9e6ce3b2fafd6fdabde3 (patch)
tree709ad4340b4bf8d6cdc8b373075f906d136c7cbf /res
parentc7e89d37938e29c7e940f48d7759148cf32c0467 (diff)
parent32f510ed80edaf790d418cbf76c45213b0ba4e30 (diff)
downloadLegacyCamera-2f619da3f49e2f42019a9e6ce3b2fafd6fdabde3.zip
LegacyCamera-2f619da3f49e2f42019a9e6ce3b2fafd6fdabde3.tar.gz
LegacyCamera-2f619da3f49e2f42019a9e6ce3b2fafd6fdabde3.tar.bz2
am 32f510ed: Add 2560x1920 picture size.
Merge commit '32f510ed80edaf790d418cbf76c45213b0ba4e30' * commit '32f510ed80edaf790d418cbf76c45213b0ba4e30': Add 2560x1920 picture size.
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0e89d1b..af48f8c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -100,6 +100,7 @@
-->
<item>@string/pref_camera_picturesize_entry_2592x1936</item>
<item>@string/pref_camera_picturesize_entry_2592x1936</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1936</item>
<item>@string/pref_camera_picturesize_entry_2048x1536</item>
<item>@string/pref_camera_picturesize_entry_1600x1200</item>
<item>@string/pref_camera_picturesize_entry_1024x768</item>
@@ -113,6 +114,7 @@
<string-array name="pref_camera_picturesize_entryvalues" translatable="false">
<item>2592x1944</item>
<item>2592x1936</item>
+ <item>2560x1920</item>
<item>2048x1536</item>
<item>1600x1200</item>
<item>1024x768</item>