summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@gmail.com>2016-06-19 23:56:50 +0800
committerdianlujitao <dianlujitao@gmail.com>2016-06-20 00:00:49 +0800
commitcd37b99feab5851b4d3cf155c9a54c3f6ffca164 (patch)
tree3aaecea3995df7dc4f58d107de09a2697bc84eb9 /res/values
parentf6bb5ad065925e82c8082a186e40c802ab2c2c4c (diff)
downloadandroid_packages_apps_Snap-cd37b99feab5851b4d3cf155c9a54c3f6ffca164.tar.gz
android_packages_apps_Snap-cd37b99feab5851b4d3cf155c9a54c3f6ffca164.tar.bz2
android_packages_apps_Snap-cd37b99feab5851b4d3cf155c9a54c3f6ffca164.zip
Snap: Add picture resolutions for OnePlus 3
Change-Id: Iceab9172656e21cef6e80da724af841cec6503c8
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml10
-rw-r--r--res/values/cm_strings.xml8
2 files changed, 18 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2a6f0cefb..da451a136 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -162,6 +162,7 @@
<item>@string/pref_camera_picturesize_entry_20_1mp_wide</item> <!-- 520 -->
<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_wide</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 -->
@@ -171,6 +172,8 @@
<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</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 -->
@@ -187,6 +190,7 @@
<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</item> <!-- 260 -->
@@ -208,6 +212,7 @@
<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 -->
@@ -229,6 +234,7 @@
<item>5376x3752</item> <!-- 520 -->
<item>4992x3744</item> <!-- 510 -->
<item>5376x3024</item> <!-- 500 -->
+ <item>4640x3480</item> <!-- 497 -->
<item>5344x3006</item> <!-- 495 -->
<item>4608x3456</item> <!-- 490 -->
<item>5312x2988</item> <!-- 480 -->
@@ -238,6 +244,8 @@
<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 -->
@@ -254,6 +262,7 @@
<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>2592x1944</item> <!-- 260 -->
@@ -275,6 +284,7 @@
<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 -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 171d9b4e8..391731fd8 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -41,7 +41,11 @@
<!-- 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">12.1 MP</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] -->
@@ -73,6 +77,8 @@
<!-- 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">5 MP</string>
@@ -105,6 +111,8 @@
<!-- 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>