diff options
author | Chih-Chung Chang <chihchung@google.com> | 2009-11-09 22:25:08 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 22:25:08 -0800 |
commit | 80e5c4b7bf9a57cdff3ba0ad606768a32acb90b3 (patch) | |
tree | dbe27d8667b6922f3715f1f306117baa4f560bfe /res | |
parent | a8d39dcfd07e51a95ff36a1eff2fc1abc9a7a10f (diff) | |
parent | 532bb5e10461c92857149b9d993a9afbe5cd61ed (diff) | |
download | LegacyCamera-80e5c4b7bf9a57cdff3ba0ad606768a32acb90b3.zip LegacyCamera-80e5c4b7bf9a57cdff3ba0ad606768a32acb90b3.tar.gz LegacyCamera-80e5c4b7bf9a57cdff3ba0ad606768a32acb90b3.tar.bz2 |
am 532bb5e1: am ca99fb07: am 01ed85fb: Merge change Ic823abd0 into eclair
Merge commit '532bb5e10461c92857149b9d993a9afbe5cd61ed'
* commit '532bb5e10461c92857149b9d993a9afbe5cd61ed':
Fix 2241232: Read system properties for quality setting.
Diffstat (limited to 'res')
-rw-r--r-- | res/values/arrays.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 35e9d70..89f959f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -75,9 +75,9 @@ </string-array> <string-array name="pref_camera_jpegquality_entryvalues" translatable="false"> - <item>85</item> - <item>75</item> - <item>65</item> + <item>superfine</item> + <item>fine</item> + <item>normal</item> </string-array> <!-- Camera Preferences focus mode dialog box entries --> diff --git a/res/values/strings.xml b/res/values/strings.xml index e546e46..3fc10ca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -182,8 +182,9 @@ <!-- Settings screen, picture size dialog title --> <string name="pref_camera_picturesize_dialogtitle">Picture size</string> - <!-- Default picture quality setting.--> - <string name="pref_camera_jpegquality_default" translatable="false">85</string> + <!-- Default picture quality setting. See + pref_camera_jpegquality_entryvalues for possible values --> + <string name="pref_camera_jpegquality_default" translatable="false">superfine</string> <!-- Settings screen, Picture quality title --> <string name="pref_camera_jpegquality_title">Picture quality</string> |