diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-06 21:48:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-06 21:48:38 -0700 |
| commit | 54ad966bb60e8217e6bba37eb9234f3a3c22561f (patch) | |
| tree | dbac186a591a034664d00df5f59e2d06bfecb495 | |
| parent | 970368619ed79c694ce6a4c0a05bd8f1860fefb0 (diff) | |
| parent | b28ded7171a86d6e93010beca7e2e1c5bd5df41b (diff) | |
| download | android_packages_apps_Snap-54ad966bb60e8217e6bba37eb9234f3a3c22561f.tar.gz android_packages_apps_Snap-54ad966bb60e8217e6bba37eb9234f3a3c22561f.tar.bz2 android_packages_apps_Snap-54ad966bb60e8217e6bba37eb9234f3a3c22561f.zip | |
Merge "SnapdragonCamera: Add 16MP 16:9 picture resolution"
| -rw-r--r-- | res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f06e9279e..ab3f061a9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -177,6 +177,7 @@ <string-array name="pref_camera_picturesize_entries" translatable="false"> <item>@string/pref_camera_picturesize_entry_20mp</item> <item>@string/pref_camera_picturesize_entry_16mp</item> + <item>@string/pref_camera_picturesize_entry_16mp_wide</item> <item>@string/pref_camera_picturesize_entry_13mp</item> <item>@string/pref_camera_picturesize_entry_12mp</item> <item>@string/pref_camera_picturesize_entry_8mp</item> @@ -211,6 +212,7 @@ <string-array name="pref_camera_picturesize_entryvalues" translatable="false"> <item>5344x4016</item> <item>4608x3456</item> + <item>5312x2988</item> <item>4160x3120</item> <item>4000x3000</item> <item>3840x2160</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4ead3ba40..ad8ea7ca2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -276,6 +276,8 @@ <string name="pref_camera_picturesize_entry_20mp">20M pixels</string> <!-- Settings screen, dialog choice for 16 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_16mp">16M pixels</string> + <!-- Settings screen, dialog choice for 16 megapixels wide picture size [CHAR LIMIT=20] --> + <string name="pref_camera_picturesize_entry_16mp_wide">16M pixels (16:9)</string> <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_13mp">13M pixels</string> <!-- Settings screen, dialog choice for 12 megapixels picture size [CHAR LIMIT=20] --> |