diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-23 15:09:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-23 15:09:31 -0700 |
| commit | 03dbeabed74dce7485bcb3f4807fe4105e96830a (patch) | |
| tree | 20aac5a357ad2b6e8183a407f71c02e7854f620b /res/values | |
| parent | 5bf10cc095044440c95c704307c79370f0510f6c (diff) | |
| parent | 8b9bdf4f613b75f56385043b36b3314fe160d9c1 (diff) | |
| download | android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.tar.gz android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.tar.bz2 android_packages_apps_Snap-03dbeabed74dce7485bcb3f4807fe4105e96830a.zip | |
Merge "Merge tag 'android-4.4.3_r1' into HEAD"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d841d39a8..3181feadb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -193,7 +193,8 @@ <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_4mp_wide</item> + <item>@string/pref_camera_picturesize_entry_3mp</item> <item>@string/pref_camera_picturesize_entry_3mp</item> <item>@string/pref_camera_picturesize_entry_1920x1080</item> <item>@string/pref_camera_picturesize_entry_2mp</item> @@ -225,6 +226,7 @@ <item>2560x1920</item> <item>2688x1520</item> <item>2048x1536</item> + <item>2048x1520</item> <item>1920x1080</item> <item>1600x1200</item> <item>1920x1088</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index fc183f643..47be6891c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -277,7 +277,7 @@ <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_5mp">5M pixels</string> <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_4mp">4M pixels</string> + <string name="pref_camera_picturesize_entry_4mp_wide">4M pixels (16:9)</string> <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_3mp">3M pixels</string> <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> @@ -293,7 +293,6 @@ <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_vga">VGA</string> <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_qvga">QVGA</string> <!-- Settings screen, Focus mode title --> |