summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-06-04 11:40:20 -0700
committerAlan Newberger <alann@google.com>2013-11-01 12:53:23 -0700
commit8c686011a46f56040f76cf551e69f82eb8c1d3cb (patch)
treed17c886dce61303b6e28fb743d145b099f1dfb62 /res
parent761306fadfa94b538f43e8cf3463bf6d22814947 (diff)
downloadandroid_packages_apps_Snap-8c686011a46f56040f76cf551e69f82eb8c1d3cb.tar.gz
android_packages_apps_Snap-8c686011a46f56040f76cf551e69f82eb8c1d3cb.tar.bz2
android_packages_apps_Snap-8c686011a46f56040f76cf551e69f82eb8c1d3cb.zip
Add Samsung front camera resolutions
Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml10
-rw-r--r--res/values/strings.xml2
2 files changed, 12 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0d00d75a2..050f5a6d7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -163,8 +163,13 @@
<item>@string/pref_camera_picturesize_entry_3mp</item>
<item>@string/pref_camera_picturesize_entry_2mp</item>
<item>@string/pref_camera_picturesize_entry_2mp_wide</item>
+ <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
+ <item>@string/pref_camera_picturesize_entry_1_5mp</item>
<item>@string/pref_camera_picturesize_entry_1_3mp</item>
<item>@string/pref_camera_picturesize_entry_1mp</item>
+ <item>@string/pref_camera_picturesize_entry_1mp</item>
+ <item>960 x 720</item>
+ <item>720 x 480</item>
<item>@string/pref_camera_picturesize_entry_vga</item>
<item>@string/pref_camera_picturesize_entry_qvga</item>
</string-array>
@@ -182,8 +187,13 @@
<item>2048x1536</item>
<item>1600x1200</item>
<item>1920x1088</item>
+ <item>1920x1080</item>
+ <item>1440x1080</item>
<item>1280x960</item>
+ <item>1280x720</item>
<item>1024x768</item>
+ <item>960x720</item>
+ <item>720x480</item>
<item>640x480</item>
<item>320x240</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 352fab5d4..5ed9d0e75 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -269,6 +269,8 @@
<string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
<!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
<string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
+ <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] -->
+ <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string>
<!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] -->
<string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
<!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] -->