CameraNext: dynamically generate available photo resolutions

Instead of depending on a large matching table, generated the list
of picture sizes to show to the user directly from the supported
list returned by the camera. The list is filtered to remove
uselessly small resolutions on modern devices, to group resolutions
by aspect ratio, and to filter out fairly similar sizes.

Change-Id: I47a67a89786543baec133cf7e71df9819793ebac

3 files changed, 17 insertions, 281 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6bb3755f1..ada92c007 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -155,158 +155,6 @@
         <item>@string/time_lapse_hours</item>
     </string-array>
 
-    <!-- Camera Preferences Picture size dialog box entries -->
-    <string-array name="pref_camera_picturesize_entries" translatable="false">
-        <item>@string/pref_camera_picturesize_entry_21mp</item> <!-- 540 -->
-        <item>@string/pref_camera_picturesize_entry_20_7mp</item> <!-- 530 -->
-        <item>@string/pref_camera_picturesize_entry_20_1mp_wide</item> <!-- 520 -->
-        <item>@string/pref_camera_picturesize_entry_20mp_wide</item> <!-- 515 -->
-        <item>@string/pref_camera_picturesize_entry_18mp</item> <!-- 510 -->
-        <item>@string/pref_camera_picturesize_entry_16_2mp_wide</item> <!-- 500 -->
-        <item>@string/pref_camera_picturesize_entry_16_1mp</item> <!-- 497 -->
-        <item>@string/pref_camera_picturesize_entry_16_1mp_wide</item> <!-- 495 -->
-        <item>@string/pref_camera_picturesize_entry_16mp</item> <!-- 490 -->
-        <item>@string/pref_camera_picturesize_entry_15_9mp_wide</item> <!-- 480 -->
-        <item>@string/pref_camera_picturesize_entry_15mp</item> <!-- 475 -->
-        <item>@string/pref_camera_picturesize_entry_13mp</item> <!-- 470 -->
-        <item>@string/pref_camera_picturesize_entry_13mp</item> <!-- 460 -->
-        <item>@string/pref_camera_picturesize_entry_12_8mp</item> <!-- 450 -->
-        <item>@string/pref_camera_picturesize_entry_12_7mp</item> <!-- 440 -->
-        <item>@string/pref_camera_picturesize_entry_12_6mp</item> <!-- 430 -->
-        <item>@string/pref_camera_picturesize_entry_12_2mp</item> <!-- 425 -->
-        <item>@string/pref_camera_picturesize_entry_12_2mp_square</item> <!-- 424 -->
-        <item>@string/pref_camera_picturesize_entry_12_1mp_wide</item> <!-- 422 -->
-        <item>@string/pref_camera_picturesize_entry_12mp</item> <!-- 420 -->
-        <item>@string/pref_camera_picturesize_entry_11_9mp_wide</item> <!-- 415 -->
-        <item>@string/pref_camera_picturesize_entry_11_9mp</item> <!-- 410 -->
-        <item>@string/pref_camera_picturesize_entry_11_5mp</item> <!-- 400 -->
-        <item>@string/pref_camera_picturesize_entry_10_4mp</item> <!-- 390 -->
-        <item>@string/pref_camera_picturesize_entry_10mp</item> <!-- 380 -->
-        <item>@string/pref_camera_picturesize_entry_10mp</item> <!-- 370 -->
-        <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item> <!-- 360 -->
-        <item>@string/pref_camera_picturesize_entry_9_6mp_wide</item> <!-- 355 -->
-        <item>@string/pref_camera_picturesize_entry_9_4mp_wide</item> <!-- 350 -->
-        <item>@string/pref_camera_picturesize_entry_9mp_square</item> <!-- 345 -->
-        <item>@string/pref_camera_picturesize_entry_9mp</item> <!-- 340 -->
-        <item>@string/pref_camera_picturesize_entry_8_9mp</item> <!-- 335 -->
-        <item>@string/pref_camera_picturesize_entry_8_2mp_wide</item> <!-- 330 -->
-        <item>@string/pref_camera_picturesize_entry_8mp</item> <!-- 320 -->
-        <item>@string/pref_camera_picturesize_entry_7_7mp</item> <!-- 310 -->
-        <item>@string/pref_camera_picturesize_entry_7_5mp_wide</item> <!-- 300 -->
-        <item>@string/pref_camera_picturesize_entry_6_4mp</item> <!-- 290 -->
-        <item>@string/pref_camera_picturesize_entry_6mp_square</item> <!-- 285 -->
-        <item>@string/pref_camera_picturesize_entry_6mp_wide</item> <!-- 280 -->
-        <item>@string/pref_camera_picturesize_entry_6mp_wide</item> <!-- 270 -->
-        <item>@string/pref_camera_picturesize_entry_5mp_square</item> <!-- 265 -->
-        <item>@string/pref_camera_picturesize_entry_5mp</item> <!-- 260 -->
-        <item>@string/pref_camera_picturesize_entry_5mp</item> <!-- 250 -->
-        <item>@string/pref_camera_picturesize_entry_5mp</item> <!-- 240 -->
-        <item>@string/pref_camera_picturesize_entry_4_5mp</item> <!-- 230 -->
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item> <!-- 220 -->
-        <item>@string/pref_camera_picturesize_entry_4mp_wide</item> <!-- 215 -->
-        <item>@string/pref_camera_picturesize_entry_4mp</item> <!-- 210 -->
-        <item>@string/pref_camera_picturesize_entry_3_7mp_wide</item> <!-- 200 -->
-        <item>@string/pref_camera_picturesize_entry_3mp</item> <!-- 190 -->
-        <item>@string/pref_camera_picturesize_entry_3mp</item> <!-- 180 -->
-        <item>@string/pref_camera_picturesize_entry_2_5mp</item> <!-- 170 -->
-        <item>@string/pref_camera_picturesize_entry_2_5mp_wide</item> <!-- 160 -->
-        <item>@string/pref_camera_picturesize_entry_2_1mp_wide</item> <!-- 150 -->
-        <item>@string/pref_camera_picturesize_entry_2mp</item> <!-- 140 -->
-        <item>@string/pref_camera_picturesize_entry_2mp_wide</item> <!-- 130 -->
-        <item>@string/pref_camera_picturesize_entry_1_9mp</item> <!-- 120 -->
-        <item>@string/pref_camera_picturesize_entry_1_6mp</item> <!-- 115 -->
-        <item>@string/pref_camera_picturesize_entry_1_5mp</item> <!-- 110 -->
-        <item>@string/pref_camera_picturesize_entry_1_3mp</item> <!-- 100 -->
-        <item>@string/pref_camera_picturesize_entry_1_2mp_square</item> <!-- 97 -->
-        <item>@string/pref_camera_picturesize_entry_1_2mp_wide</item> <!-- 95 -->
-        <item>@string/pref_camera_picturesize_entry_1mp</item> <!-- 90 -->
-        <item>@string/pref_camera_picturesize_entry_wxga</item> <!-- 80 -->
-        <item>@string/pref_camera_picturesize_entry_xga</item> <!-- 70 -->
-        <item>@string/pref_camera_picturesize_entry_svga</item> <!-- 60 -->
-        <item>@string/pref_camera_picturesize_entry_wvga</item> <!-- 50 -->
-        <item>@string/pref_camera_picturesize_entry_vga</item> <!-- 40 -->
-        <item>@string/pref_camera_picturesize_entry_nhd_wide</item> <!-- 30 -->
-        <item>@string/pref_camera_picturesize_entry_wqvga</item> <!-- 20 -->
-        <item>@string/pref_camera_picturesize_entry_qvga</item> <!-- 10 -->
-    </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>5344x4008</item> <!-- 540 -->
-        <item>5248x3936</item> <!-- 530 -->
-        <item>5376x3752</item> <!-- 520 -->
-        <item>5952x3348</item> <!-- 515 -->
-        <item>4992x3744</item> <!-- 510 -->
-        <item>5376x3024</item> <!-- 500 -->
-        <item>4640x3480</item> <!-- 497 -->
-        <item>5344x3006</item> <!-- 495 -->
-        <item>4608x3456</item> <!-- 490 -->
-        <item>5312x2988</item> <!-- 480 -->
-        <item>4352x3264</item> <!-- 475 -->
-        <item>4208x3120</item> <!-- 470 -->
-        <item>4160x3120</item> <!-- 460 -->
-        <item>4128x3096</item> <!-- 450 -->
-        <item>4128x3088</item> <!-- 440 -->
-        <item>4096x3072</item> <!-- 430 -->
-        <item>4032x3024</item> <!-- 425 -->
-        <item>3488x3488</item> <!-- 424 -->
-        <item>4640x2610</item> <!-- 422 -->
-        <item>4000x3000</item> <!-- 420 -->
-        <item>4608x2592</item> <!-- 415 -->
-        <item>3984x2988</item> <!-- 410 -->
-        <item>3920x2940</item> <!-- 400 -->
-        <item>4128x2528</item> <!-- 390 -->
-        <item>4320x2432</item> <!-- 380 -->
-        <item>3648x2736</item> <!-- 370 -->
-        <item>4160x2340</item> <!-- 360 -->
-        <item>4128x2322</item> <!-- 355 -->
-        <item>4096x2304</item> <!-- 350 -->
-        <item>2976x2976</item> <!-- 345 -->
-        <item>3920x2204</item> <!-- 340 -->
-        <item>3456x2592</item> <!-- 335 -->
-        <item>3840x2160</item> <!-- 330 -->
-        <item>3264x2448</item> <!-- 320 -->
-        <item>3200x2400</item> <!-- 310 -->
-        <item>3648x2052</item> <!-- 300 -->
-        <item>3264x1968</item> <!-- 290 -->
-        <item>2464x2464</item> <!-- 285 -->
-        <item>3264x1840</item> <!-- 280 -->
-        <item>3264x1836</item> <!-- 270 -->
-        <item>2240x2240</item> <!-- 265 -->
-        <item>2592x1944</item> <!-- 260 -->
-        <item>2592x1936</item> <!-- 250 -->
-        <item>2560x1920</item> <!-- 240 -->
-        <item>2592x1728</item> <!-- 230 -->
-        <item>2688x1520</item> <!-- 220 -->
-        <item>2688x1512</item> <!-- 215 -->
-        <item>2560x1536</item> <!-- 210 -->
-        <item>2560x1440</item> <!-- 200 -->
-        <item>2048x1536</item> <!-- 190 -->
-        <item>2048x1520</item> <!-- 180 -->
-        <item>2048x1232</item> <!-- 170 -->
-        <item>2048x1152</item> <!-- 160 -->
-        <item>1920x1080</item> <!-- 150 -->
-        <item>1600x1200</item> <!-- 140 -->
-        <item>1920x1088</item> <!-- 130 -->
-        <item>1392x1392</item> <!-- 120 -->
-        <item>1440x1080</item> <!-- 115 -->
-        <item>1600x960</item> <!-- 110 -->
-        <item>1280x960</item> <!-- 100 -->
-        <item>1080x1080</item> <!-- 97 -->
-        <item>1440x810</item> <!-- 95 -->
-        <item>1280x720</item> <!-- 90 -->
-        <item>1024x768</item> <!-- 80 -->
-        <item>1024x600</item> <!-- 70 -->
-        <item>800x600</item> <!-- 60 -->
-        <item>800x480</item> <!-- 50 -->
-        <item>640x480</item> <!-- 40 -->
-        <item>640x360</item> <!-- 30 -->
-        <item>480x320</item> <!-- 20 -->
-        <item>320x240</item> <!-- 10 -->
-    </string-array>
-
     <!-- Camera Preferences focus mode dialog box entries -->
     <string-array name="pref_camera_focusmode_entries" translatable="false">
         <item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a987cad5c..929e1e87f 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -15,135 +15,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Settings screen, dialog choice for 21 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_21mp">21 MP</string>
-    <!-- Settings screen, dialog choice for 20.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_20_7mp">20.7 MP</string>
-    <!-- Settings screen, dialog choice for 20.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_20_1mp_wide">20.1 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_20mp_wide">20 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_18mp">18 MP</string>
-    <!-- Settings screen, dialog choice for 16.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16_2mp_wide">16.2 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 16.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16_1mp_wide">16.1 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 16.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16_1mp">16.1 MP</string>
-    <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_16mp">16 MP</string>
-    <!-- Settings screen, dialog choice for 15.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 15 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_15mp">15 MP</string>
-    <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_13mp">13 MP</string>
-    <!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_8mp">12.8 MP</string>
-    <!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_7mp">12.7 MP</string>
-    <!-- Settings screen, dialog choice for 12.6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_6mp">12.6 MP</string>
-    <!-- Settings screen, dialog choice for 12.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_2mp_square">12.2 MP (1:1)</string>
-    <!-- Settings screen, dialog choice for 12.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_2mp">12.2 MP</string>
-    <!-- Settings screen, dialog choice for 12.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12_1mp_wide">12.1 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_12mp">12 MP</string>
-    <!-- Settings screen, dialog choice for 11.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_11_9mp_wide">11.9 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 11.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_11_9mp">11.9 MP</string>
-    <!-- Settings screen, dialog choice for 11.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_11_5mp">11.5 MP</string>
-    <!-- Settings screen, dialog choice for 10.4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_10_4mp">10.4 MP</string>
-    <!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
-    <!-- Settings screen, dialog choice for 9.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 9.6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9_6mp_wide">9.6 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 9.4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9_4mp_wide">9.4 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9mp_square">9 MP (1:1) </string>
-    <!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
-    <!-- Settings screen, dialog choice for 8.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_8_9mp">8.9 MP</string>
-    <!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_8mp">8 MP</string>
-    <!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_7_7mp">7.7 MP</string>
-    <!-- Settings screen, dialog choice for 7.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_7_5mp_wide">7.5 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6_4mp">6.4 MP</string>
-    <!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6mp_square">6 MP (1:1)</string>
-    <!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_6mp_wide">6 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_5mp_square">5 MP (1:1) </string>
-    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_5mp">5 MP</string>
-    <!-- Settings screen, dialog choice for 4.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_4_5mp">4.5 MP</string>
-    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_4mp_wide">4 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_4mp">4 MP</string>
-    <!-- Settings screen, dialog choice for 3.7 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_3mp">3 MP</string>
-    <!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_5mp_wide">2.5 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_5mp">2.5 MP</string>
-    <!-- Settings screen, dialog choice for 2.1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2mp_wide">2 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_2mp">2 MP</string>
-    <!-- Settings screen, dialog choice for 1.9 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_9mp">1.9 MP</string>
-    <!-- Settings screen, dialog choice for 1.6 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_6mp">1.6 MP</string>
-    <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_5mp">1.5 MP</string>
-    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_3mp">1.3 MP</string>
-    <!-- Settings screen, dialog choice for 1.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_2mp_square">1.2 MP (1:1)</string>
-    <!-- Settings screen, dialog choice for 1.2 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1_2mp_wide">1.2 MP (16:9)</string>
-    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_1mp">1 MP</string>
-    <!-- Settings screen, dialog choice for WXGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
-    <!-- Settings screen, dialog choice for XGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_xga">XGA</string>
-    <!-- Settings screen, dialog choice for SVGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_svga">SVGA</string>
-    <!-- Settings screen, dialog choice for WVGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_wvga">WVGA</string>
-    <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_vga">VGA</string>
-    <!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
-    <!-- Settings screen, dialog choice for WQVGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_wqvga">WQVGA</string>
-    <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=15] -->
-    <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
+    <!-- common aspect ratios -->
+    <string name="pref_camera_aspectratio_43" translatable="false">4:3</string>
+    <string name="pref_camera_aspectratio_32" translatable="false">3:2</string>
+    <string name="pref_camera_aspectratio_1610" translatable="false">16:10</string>
+    <string name="pref_camera_aspectratio_53" translatable="false">5:3</string>
+    <string name="pref_camera_aspectratio_169" translatable="false">16:9</string>
+    <string name="pref_camera_aspectratio_11" translatable="false">1:1</string>
+    <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+    <string name="pref_camera_aspectratio_wide">Wide</string>
+
+    <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
+         parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
+         NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
+         will be multiplied by 100 as those languages want to count by ten thousands -->
+    <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
 
     <!-- Settings screen, scene mode -->
     <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index d4344fbdd..009b99488 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -70,4 +70,6 @@
          will be enabled ONLY for these scenemodes and disabled for others. -->
     <string-array name="longshot_scenemodes"></string-array>
 
+    <!-- Minimum picture size (in pixel) to include in selection list -->
+    <integer name="minimum_picture_size">900000</integer>
 </resources>