Merge "functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame." into gb-ub-photos-carlsbad
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1cae7bc..f40c6ef 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -154,6 +154,7 @@
<!-- Camera Preferences Picture size dialog box entries -->
<string-array name="pref_camera_picturesize_entries" translatable="false">
+ <item>@string/pref_camera_picturesize_entry_13mp</item>
<item>@string/pref_camera_picturesize_entry_8mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
@@ -170,6 +171,7 @@
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>3264x2448</item>
<item>2592x1944</item>
<item>2592x1936</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1c2e31..0ec4da6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -672,6 +672,8 @@
<!-- Settings screen, Picture size title -->
<string name="pref_camera_picturesize_title">Picture size</string>
+ <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_13mp">13M pixels</string>
<!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
<!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->