summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-09-24 17:02:54 +0800
committerlikaid <likaid@codeaurora.org>2015-09-24 17:02:54 +0800
commit3ec8fb4e5a0c151daa588d824598db4b793ae2a7 (patch)
tree1883dcd2de0b49244bcb66bc5f7c370e298ac405
parentbe517166b384881e43c288cda0427d82b67b2064 (diff)
downloadandroid_packages_apps_Snap-3ec8fb4e5a0c151daa588d824598db4b793ae2a7.tar.gz
android_packages_apps_Snap-3ec8fb4e5a0c151daa588d824598db4b793ae2a7.tar.bz2
android_packages_apps_Snap-3ec8fb4e5a0c151daa588d824598db4b793ae2a7.zip
SnapdragonCamera: Update the options for the Picture quality
Change the menu items for Picture quality setting Only leave three options for the Picture quality setting Change-Id: I09e615ffb933983352d4a15f44ffef23adbe64ea CRs-Fixed: 905006
-rw-r--r--res/values-zh-rCN/strings.xml5
-rw-r--r--res/values/qcomarrays.xml18
-rw-r--r--res/values/qcomstrings.xml12
3 files changed, 8 insertions, 27 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 044cb6db7..ac982d414 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -629,4 +629,9 @@
<!-- Settings screen, TNR location dialog choices -->
<string name="pref_camera_tnr_entry_disable">禁用</string>
<string name="pref_camera_tnr_entry_enable">启用</string>
+
+ <!-- Settings screen, Picture quality dialog radio button choices -->
+ <string name="pref_camera_jpegquality_entry_0">低</string>
+ <string name="pref_camera_jpegquality_entry_1">标准</string>
+ <string name="pref_camera_jpegquality_entry_2">高</string>
</resources>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 02686864e..364964404 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -183,37 +183,19 @@
<item>@string/pref_camera_jpegquality_entry_0</item>
<item>@string/pref_camera_jpegquality_entry_1</item>
<item>@string/pref_camera_jpegquality_entry_2</item>
- <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">
<item>55</item>
- <item>65</item>
- <item>75</item>
<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. -->
<integer-array name="jpegquality_compression_ratio">
<item>48</item>
- <item>38</item>
- <item>31</item>
<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 eace72dad..ea3b7deff 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -717,15 +717,9 @@
<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>
- <string name="pref_camera_jpegquality_entry_3">Jpeg 85%</string>
- <string name="pref_camera_jpegquality_entry_4">Jpeg 95%</string>
- <string name="pref_camera_jpegquality_entry_5">Jpeg 100%</string>
+ <string name="pref_camera_jpegquality_entry_0">Low</string>
+ <string name="pref_camera_jpegquality_entry_1">Standard</string>
+ <string name="pref_camera_jpegquality_entry_2">High</string>
<!-- Default auto histogram setting. Do not translate. -->
<string name="pref_camera_histogram_default">disable</string>