diff options
author | Alan Newberger <alann@google.com> | 2013-11-01 13:39:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 13:39:30 -0700 |
commit | 1e8e8cecd02b98c261c7b2fd267f8846dbe90c03 (patch) | |
tree | 777f7e571aa3dd7a869fce234e244bf7b5e54782 | |
parent | d07f6ac064ee13b8da9539884309d47af9a07f91 (diff) | |
parent | ccfafd95cd4fa046df9d43469d28152f8a04bfed (diff) | |
download | android_packages_apps_Snap-1e8e8cecd02b98c261c7b2fd267f8846dbe90c03.tar.gz android_packages_apps_Snap-1e8e8cecd02b98c261c7b2fd267f8846dbe90c03.tar.bz2 android_packages_apps_Snap-1e8e8cecd02b98c261c7b2fd267f8846dbe90c03.zip |
am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
* commit 'ccfafd95cd4fa046df9d43469d28152f8a04bfed':
Add Samsung front camera resolutions
-rw-r--r-- | res/values/arrays.xml | 10 | ||||
-rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0d00d75a2..050f5a6d7 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -163,8 +163,13 @@ <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_2mp_wide</item> + <item>@string/pref_camera_picturesize_entry_1_5mp</item> <item>@string/pref_camera_picturesize_entry_1_3mp</item> <item>@string/pref_camera_picturesize_entry_1mp</item> + <item>@string/pref_camera_picturesize_entry_1mp</item> + <item>960 x 720</item> + <item>720 x 480</item> <item>@string/pref_camera_picturesize_entry_vga</item> <item>@string/pref_camera_picturesize_entry_qvga</item> </string-array> @@ -182,8 +187,13 @@ <item>2048x1536</item> <item>1600x1200</item> <item>1920x1088</item> + <item>1920x1080</item> + <item>1440x1080</item> <item>1280x960</item> + <item>1280x720</item> <item>1024x768</item> + <item>960x720</item> + <item>720x480</item> <item>640x480</item> <item>320x240</item> </string-array> diff --git a/res/values/strings.xml b/res/values/strings.xml index 352fab5d4..5ed9d0e75 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -269,6 +269,8 @@ <string name="pref_camera_picturesize_entry_2mp">2M pixels</string> <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string> + <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] --> + <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string> <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string> <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] --> |