summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-10-14 21:12:44 -0700
committerSteve Kondik <shade@chemlab.org>2013-10-16 09:13:57 -0700
commit1d2f602592a4af8e1e88d9c664f924474d3c829b (patch)
treeaadb605d51803525b6138cd78d80a6c69bd40fa1
parent2af78fdfb4a069481cc895259e44977b2844258e (diff)
downloadandroid_packages_apps_Gallery2-1d2f602592a4af8e1e88d9c664f924474d3c829b.tar.gz
android_packages_apps_Gallery2-1d2f602592a4af8e1e88d9c664f924474d3c829b.tar.bz2
android_packages_apps_Gallery2-1d2f602592a4af8e1e88d9c664f924474d3c829b.zip
camera: Add new picture sizes for N1
Change-Id: I5edc7e9657b0be7e1d5705bc3b8f05f1878134b3
-rw-r--r--res/values/arrays.xml8
-rw-r--r--res/values/cm_strings.xml8
2 files changed, 16 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 28ced526d..7c73a9ec3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -159,10 +159,14 @@
<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_5mp</item>
+ <item>@string/pref_camera_picturesize_entry_10_4mp</item>
<item>@string/pref_camera_picturesize_entry_9mp</item>
<item>@string/pref_camera_picturesize_entry_8_2mp</item>
<item>@string/pref_camera_picturesize_entry_8mp</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</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
@@ -198,10 +202,14 @@
<item>4208x3120</item>
<item>4160x3120</item>
<item>4128x3096</item>
+ <item>4128x3088</item>
+ <item>4000x3000</item>
<item>3920x2940</item>
+ <item>4128x2528</item>
<item>3920x2204</item>
<item>3840x2160</item>
<item>3264x2448</item>
+ <item>3200x2400</item>
<item>3264x1968</item>
<item>3264x1836</item>
<item>2592x1944</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 088c9f1c2..60afd6fcb 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -28,12 +28,20 @@
<string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
<!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
+ <!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
+ <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_12mp">12M pixels (4x3)</string>
<!-- Settings screen, dialog choice for 11.5 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
+ <!-- Settings screen, dialog choice for 10.4 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
<!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
<!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+ <!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels (4x3)</string>
<!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
<!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->