diff options
| author | Michael Kolb <kolby@google.com> | 2013-06-12 11:57:45 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2013-12-02 18:07:31 -0800 |
| commit | 398f151a6292a617cd635cc05fa9e0abaece5c19 (patch) | |
| tree | 9fa7aa597166a593e1abfbda8771d01b2bff44a0 | |
| parent | 88f9b3e75c313d181c49ac644930627c40b2138d (diff) | |
| download | android_packages_apps_Snap-398f151a6292a617cd635cc05fa9e0abaece5c19.tar.gz android_packages_apps_Snap-398f151a6292a617cd635cc05fa9e0abaece5c19.tar.bz2 android_packages_apps_Snap-398f151a6292a617cd635cc05fa9e0abaece5c19.zip | |
Add another HTC picture resolution
patching into Carlsbad branch from Bryce
Bug: 9370319
Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc
Conflicts:
res/values/strings.xml
| -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 --> |