diff options
| author | Michael Kolb <kolby@google.com> | 2013-05-30 13:39:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 13:39:00 -0700 |
| commit | b854b303ee8df164541e334c417878b4e48e5c91 (patch) | |
| tree | 0f35440ea4d85966999002c8146f9e7d5f41d5fa /res | |
| parent | af98c95d8e526b4b1d464aecd1c8a273707d1fec (diff) | |
| parent | d6c1993f6c24ff64c18a40ab596d5131b02d6f51 (diff) | |
| download | android_packages_apps_Snap-b854b303ee8df164541e334c417878b4e48e5c91.tar.gz android_packages_apps_Snap-b854b303ee8df164541e334c417878b4e48e5c91.tar.bz2 android_packages_apps_Snap-b854b303ee8df164541e334c417878b4e48e5c91.zip | |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
* commit 'af65d7ba216eba60651d11d248d20346309375ed':
Add HTC One picture resolutions
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f40c6efbc..545765033 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -159,8 +159,10 @@ <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_3mp</item> <item>@string/pref_camera_picturesize_entry_2mp</item> + <item>@string/pref_camera_picturesize_entry_2mp_wide</item> <item>@string/pref_camera_picturesize_entry_1_3mp</item> <item>@string/pref_camera_picturesize_entry_1mp</item> <item>@string/pref_camera_picturesize_entry_vga</item> @@ -176,8 +178,10 @@ <item>2592x1944</item> <item>2592x1936</item> <item>2560x1920</item> + <item>2688x1520</item> <item>2048x1536</item> <item>1600x1200</item> + <item>1920x1088</item> <item>1280x960</item> <item>1024x768</item> <item>640x480</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ec4da624..cb4bc1853 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -678,10 +678,14 @@ <string name="pref_camera_picturesize_entry_8mp">8M pixels</string> <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] --> <string name="pref_camera_picturesize_entry_5mp">5M pixels</string> + <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] --> + <string name="pref_camera_picturesize_entry_4mp">4M pixels</string> <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] --> <string name="pref_camera_picturesize_entry_3mp">3M pixels</string> <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] --> <string name="pref_camera_picturesize_entry_2mp">2M pixels</string> + <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] --> + <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string> <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] --> <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string> <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] --> |