summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2009-11-09 19:17:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 19:17:29 -0800
commitca99fb07777edcde4c9159c1567b95a227e916fa (patch)
tree7c141848609a9097045a397345cb88034599922d /res/values
parent87ac6d7c8a1c64402a04b577b907594399f39bc2 (diff)
parent01ed85fbf71fd89db9d031d1cc5529afd7b624f0 (diff)
downloadLegacyCamera-ca99fb07777edcde4c9159c1567b95a227e916fa.zip
LegacyCamera-ca99fb07777edcde4c9159c1567b95a227e916fa.tar.gz
LegacyCamera-ca99fb07777edcde4c9159c1567b95a227e916fa.tar.bz2
am 01ed85fb: Merge change Ic823abd0 into eclair
Merge commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0' into eclair-mr2 * commit '01ed85fbf71fd89db9d031d1cc5529afd7b624f0': Fix 2241232: Read system properties for quality setting.
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml6
-rw-r--r--res/values/strings.xml5
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 27ca6b0..5a1dc4b 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>