From: Michael Kolb <kolby@google.com>
Date: Tue, 4 Jun 2013 18:40:20 +0000 (-0700)
Subject: Add Samsung front camera resolutions
X-Git-Tag: android-x86-6.0-r3~1684^2~20^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8c686011a46f56040f76cf551e69f82eb8c1d3cb;p=android-x86%2Fpackages-apps-Camera2.git

Add Samsung front camera resolutions

  Bug: 11462711
  Bug: 9275928

Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
---

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] -->