summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLars Greiss <kufikugel@googlemail.com>2013-12-29 12:23:33 +0100
committerMichael Bestas <mikeioannina@gmail.com>2015-09-17 23:26:03 +0300
commite453b7728763c1e20718060e0b5cf78fd342595f (patch)
treefaf6d6ba5c5fe11b8f0cf68d52854b284085d0c8 /res
parent7d9c22ca00a78614afbd79e3785bab7e39ce02c4 (diff)
downloadandroid_packages_apps_Snap-e453b7728763c1e20718060e0b5cf78fd342595f.tar.gz
android_packages_apps_Snap-e453b7728763c1e20718060e0b5cf78fd342595f.tar.bz2
android_packages_apps_Snap-e453b7728763c1e20718060e0b5cf78fd342595f.zip
Camera: remove fine/normal/superfine jpegquality and use always int
We use now a set of int values the user can exactly assign. Showing as well the normal fine superfine as choice is just a duplicate. As well we can get rid of the weird converts of the mixed values. To take care that the user does not get into problems we updated the db version and we make a convertion. Change-Id: I2615666bc1c929c0c045840fad1ece55fb0640af
Diffstat (limited to 'res')
-rw-r--r--res/values/qcomarrays.xml9
-rw-r--r--res/values/qcomstrings.xml5
2 files changed, 1 insertions, 13 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index a746ba172..4e2e4532f 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -186,9 +186,6 @@
<item>@string/pref_camera_jpegquality_entry_3</item>
<item>@string/pref_camera_jpegquality_entry_4</item>
<item>@string/pref_camera_jpegquality_entry_5</item>
- <item>@string/pref_camera_jpegquality_entry_superfine</item>
- <item>@string/pref_camera_jpegquality_entry_fine</item>
- <item>@string/pref_camera_jpegquality_entry_normal</item>
</string-array>
<string-array name="pref_camera_jpegquality_entryvalues" translatable="false">
@@ -198,9 +195,6 @@
<item>85</item>
<item>95</item>
<item>100</item>
- <item>superfine</item>
- <item>fine</item>
- <item>normal</item>
</string-array>
<!-- Rough estimates of jpeg compression ratio corresponding to qualities defined above. -->
@@ -211,9 +205,6 @@
<item>20</item>
<item>11</item>
<item>6</item>
- <item>20</item>
- <item>31</item>
- <item>38</item>
</integer-array>
<!-- Camera Preferences Color effect dialog box entries -->
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index c7fff0fbd..135ab48d5 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -545,7 +545,7 @@
<!-- Default picture quality setting. See
pref_camera_jpegquality_entryvalues for possible values -->
- <string name="pref_camera_jpegquality_default" translatable="false">superfine</string>
+ <string name="pref_camera_jpegquality_default" translatable="false">85</string>
<!-- Default Picture format setting. Do not translate. -->
<string name="pref_camera_picture_format_default">jpeg</string>
@@ -702,9 +702,6 @@
<string name="pref_camera_jpegquality_title">Picture quality</string>
<!-- Settings screen, Picture quality dialog radio button choices -->
- <string name="pref_camera_jpegquality_entry_superfine">Super fine</string>
- <string name="pref_camera_jpegquality_entry_fine">Fine</string>
- <string name="pref_camera_jpegquality_entry_normal">Normal</string>
<string name="pref_camera_jpegquality_entry_0">Jpeg 55%</string>
<string name="pref_camera_jpegquality_entry_1">Jpeg 65%</string>
<string name="pref_camera_jpegquality_entry_2">Jpeg 75%</string>