diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-07-11 21:20:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-11 21:20:44 -0700 |
| commit | be3465750ac0ceeae737d6764dcc73a700328a6d (patch) | |
| tree | b6ad174a4fa886c273ae6c5b197678c526c2f4e7 /res/values | |
| parent | 4ec8dbb678143d5b7123e5b42509413691058235 (diff) | |
| parent | cca7099a7c414ab94b97b3f35dec86a5c7f669a8 (diff) | |
| download | android_packages_apps_Snap-be3465750ac0ceeae737d6764dcc73a700328a6d.tar.gz android_packages_apps_Snap-be3465750ac0ceeae737d6764dcc73a700328a6d.tar.bz2 android_packages_apps_Snap-be3465750ac0ceeae737d6764dcc73a700328a6d.zip | |
Merge "SnapdragonCamera: Add 21 MP resolution"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ab3f061a9..cb100af64 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -175,7 +175,7 @@ <!-- Camera Preferences Picture size dialog box entries --> <string-array name="pref_camera_picturesize_entries" translatable="false"> - <item>@string/pref_camera_picturesize_entry_20mp</item> + <item>@string/pref_camera_picturesize_entry_21mp</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> @@ -210,7 +210,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>5344x4016</item> + <item>5344x4008</item> <item>4608x3456</item> <item>5312x2988</item> <item>4160x3120</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index ad8ea7ca2..ce802e21a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -273,7 +273,7 @@ <!-- Settings screen, Picture size title --> <string name="pref_camera_picturesize_title">Picture size</string> <!-- Settings screen, dialog choice for 20 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_20mp">20M pixels</string> + <string name="pref_camera_picturesize_entry_21mp">21M 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] --> |