Add HTC One picture resolutions
Bug: 9175168
Fixes bug where preview is not stopped before size changes
Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f40c6ef..5457650 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -159,8 +159,10 @@
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
+ <item>@string/pref_camera_picturesize_entry_4mp</item>
<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_1_3mp</item>
<item>@string/pref_camera_picturesize_entry_1mp</item>
<item>@string/pref_camera_picturesize_entry_vga</item>
@@ -176,8 +178,10 @@
<item>2592x1944</item>
<item>2592x1936</item>
<item>2560x1920</item>
+ <item>2688x1520</item>
<item>2048x1536</item>
<item>1600x1200</item>
+ <item>1920x1088</item>
<item>1280x960</item>
<item>1024x768</item>
<item>640x480</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ec4da6..cb4bc18 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -678,10 +678,14 @@
<string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
<!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_5mp">5M pixels</string>
+ <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
<!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_3mp">3M pixels</string>
<!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
+ <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
<!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->