CameraLegacy: add support for all camera resolutions

Change-Id: I6d1e2c1fb86aafca6d0cebe11160a1e31f4a48a9

2 files changed, 85 insertions, 5 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1180e9b..1b86fb6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -83,30 +83,90 @@
                 late for the translation. Since we show the same label as the
                 second item, we just use the second one instead.
         -->
+        <item>@string/pref_camera_picturesize_entry_4128x3096</item>
+        <item>@string/pref_camera_picturesize_entry_4000x3000</item>
+        <item>@string/pref_camera_picturesize_entry_4000x3000</item>
+        <item>@string/pref_camera_picturesize_entry_4128x2322</item>
+        <item>@string/pref_camera_picturesize_entry_4000x2250</item>
+        <item>@string/pref_camera_picturesize_entry_4000x2250</item>
+        <item>@string/pref_camera_picturesize_entry_3264x2448</item>
+        <item>@string/pref_camera_picturesize_entry_3264x1968</item>
+        <item>@string/pref_camera_picturesize_entry_3264x1952</item>
         <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_2592x1936</item>
+        <item>@string/pref_camera_picturesize_entry_2592x1936</item>
+        <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+        <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+        <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+        <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+        <item>@string/pref_camera_picturesize_entry_2560x1712</item>
+        <item>@string/pref_camera_picturesize_entry_2304x1728</item>
         <item>@string/pref_camera_picturesize_entry_2048x1536</item>
+        <item>@string/pref_camera_picturesize_entry_2048x1216</item>
+        <item>@string/pref_camera_picturesize_entry_2048x1216</item>
+        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
+        <item>@string/pref_camera_picturesize_entry_1920x1080</item>
         <item>@string/pref_camera_picturesize_entry_1600x1200</item>
+        <item>@string/pref_camera_picturesize_entry_1600x1200</item>
+        <item>@string/pref_camera_picturesize_entry_1600x960</item>
         <item>@string/pref_camera_picturesize_entry_1280x960</item>
+        <item>@string/pref_camera_picturesize_entry_1280x1024</item>
+        <item>@string/pref_camera_picturesize_entry_1280x768</item>
+        <item>@string/pref_camera_picturesize_entry_1280x720</item>
         <item>@string/pref_camera_picturesize_entry_1024x768</item>
+        <item>@string/pref_camera_picturesize_entry_800x600</item>
+        <item>@string/pref_camera_picturesize_entry_800x480</item>
         <item>@string/pref_camera_picturesize_entry_640x480</item>
+        <item>@string/pref_camera_picturesize_entry_352x288</item>
         <item>@string/pref_camera_picturesize_entry_320x240</item>
+        <item>@string/pref_camera_picturesize_entry_176x144</item>
     </string-array>
 
     <!-- When launching the camera app first time, we will set the picture
          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>4128x3096</item>
+        <item>4000x3000</item>
+        <item>4128x2322</item>
+        <item>3920x2940</item>
+        <item>4000x2250</item>
+        <item>3920x2204</item>
+        <item>3264x2448</item>
+        <item>3264x1968</item>
+        <item>3264x1952</item>
         <item>2592x1944</item>
         <item>2592x1936</item>
         <item>2560x1920</item>
+        <item>2592x1952</item>
+        <item>2592x1944</item>
+        <item>2592x1552</item>
+        <item>2592x1458</item>
+        <item>2592x1456</item>
+        <item>2560x1536</item>
+        <item>2560x1712</item>
+        <item>2304x1728</item>
         <item>2048x1536</item>
+        <item>2048x1216</item>
+        <item>2048x1232</item>
+        <item>1920x1080</item>
+        <item>1920x1088</item>
         <item>1600x1200</item>
+        <item>1632x1224</item>
+        <item>1600x960</item>
         <item>1280x960</item>
+        <item>1280x1024</item>
+        <item>1280x768</item>
+        <item>1280x720</item>
         <item>1024x768</item>
+        <item>800x600</item>
+        <item>800x480</item>
         <item>640x480</item>
+        <item>352x288</item>
         <item>320x240</item>
+        <item>176x144</item>
     </string-array>
 
     <!-- Camera Preferences focus mode dialog box entries -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a10af2..16fd303 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -138,13 +138,33 @@
     <string name="pref_camera_picturesize_title">Picture size</string>
 
     <!-- Settings screen, Picture size dialog radio button choices -->
-    <string name="pref_camera_picturesize_entry_2592x1936">5M pixels</string>
-    <string name="pref_camera_picturesize_entry_2048x1536">3M pixels</string>
-    <string name="pref_camera_picturesize_entry_1600x1200">2M pixels</string>
-    <string name="pref_camera_picturesize_entry_1280x960">1.3M pixels</string>
-    <string name="pref_camera_picturesize_entry_1024x768">1M pixels</string>
+    <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+    <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+    <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+    <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+    <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+    <string name="pref_camera_picturesize_entry_3264x1968">6.5MP(W)</string>
+    <string name="pref_camera_picturesize_entry_3264x1952">6MP(W)</string>
+    <string name="pref_camera_picturesize_entry_2592x1936">5MP</string>
+    <string name="pref_camera_picturesize_entry_2592x1552">4MP(W)</string>
+    <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+    <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+    <string name="pref_camera_picturesize_entry_2048x1536">3MP</string>
+    <string name="pref_camera_picturesize_entry_2048x1216">2.5MP(W)</string>
+    <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+    <string name="pref_camera_picturesize_entry_1600x1200">UXGA</string>
+    <string name="pref_camera_picturesize_entry_1600x960">1.5MP(W)</string>
+    <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+    <string name="pref_camera_picturesize_entry_1280x960">SXGA(4:3)</string>
+    <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+    <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+    <string name="pref_camera_picturesize_entry_1024x768">XGA</string>
+    <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+    <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
     <string name="pref_camera_picturesize_entry_640x480">VGA</string>
+    <string name="pref_camera_picturesize_entry_352x288">CIF</string>
     <string name="pref_camera_picturesize_entry_320x240">QVGA</string>
+    <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
 
     <!-- Settings screen, Focus mode title -->
     <string name="pref_camera_focusmode_title">Focus mode</string>