diff options
author | Alan Newberger <alann@google.com> | 2013-12-03 09:31:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-03 09:31:25 -0800 |
commit | a3b928919285fbe31a1201cb0b56336a3909cb4f (patch) | |
tree | df8eccf5a9b0850a1726704eaeea4c657d88f8a6 | |
parent | 8850f6d8bf69f6415e7e38448f8ef33824ac67cf (diff) | |
parent | 0d5505dd1a3bf297677161c4c6608c783d7a2b68 (diff) | |
download | android_packages_apps_Snap-a3b928919285fbe31a1201cb0b56336a3909cb4f.tar.gz android_packages_apps_Snap-a3b928919285fbe31a1201cb0b56336a3909cb4f.tar.bz2 android_packages_apps_Snap-a3b928919285fbe31a1201cb0b56336a3909cb4f.zip |
am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
* commit '0d5505dd1a3bf297677161c4c6608c783d7a2b68':
Add another HTC picture resolution
-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 050f5a6d7..79dbcd94f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -159,7 +159,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_2mp</item> <item>@string/pref_camera_picturesize_entry_2mp_wide</item> @@ -185,6 +186,7 @@ <item>2560x1920</item> <item>2688x1520</item> <item>2048x1536</item> + <item>2048x1520</item> <item>1600x1200</item> <item>1920x1088</item> <item>1920x1080</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9879864a9..7df7f5e94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -265,7 +265,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] --> @@ -281,7 +281,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 --> |