summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values-af/strings.xml4
-rw-r--r--res/values-am/strings.xml4
-rw-r--r--res/values-ar/strings.xml4
-rw-r--r--res/values-bg/strings.xml4
-rw-r--r--res/values-ca/strings.xml4
-rw-r--r--res/values-cs/strings.xml4
-rw-r--r--res/values-da/strings.xml4
-rw-r--r--res/values-de/strings.xml4
-rw-r--r--res/values-el/strings.xml4
-rw-r--r--res/values-en-rGB/strings.xml4
-rw-r--r--res/values-es-rUS/strings.xml4
-rw-r--r--res/values-es/strings.xml4
-rw-r--r--res/values-fa/strings.xml4
-rw-r--r--res/values-fi/strings.xml4
-rw-r--r--res/values-fr/strings.xml4
-rw-r--r--res/values-hr/strings.xml4
-rw-r--r--res/values-hu/strings.xml4
-rw-r--r--res/values-in/strings.xml4
-rw-r--r--res/values-it/strings.xml4
-rw-r--r--res/values-iw/strings.xml4
-rw-r--r--res/values-ja/strings.xml4
-rw-r--r--res/values-ko/strings.xml4
-rw-r--r--res/values-lt/strings.xml4
-rw-r--r--res/values-lv/strings.xml4
-rw-r--r--res/values-ms/strings.xml4
-rw-r--r--res/values-nb/strings.xml4
-rw-r--r--res/values-nl/strings.xml4
-rw-r--r--res/values-pl/strings.xml4
-rw-r--r--res/values-pt-rPT/strings.xml4
-rw-r--r--res/values-pt/strings.xml4
-rw-r--r--res/values-rm/strings.xml4
-rw-r--r--res/values-ro/strings.xml4
-rw-r--r--res/values-ru/strings.xml4
-rw-r--r--res/values-sk/strings.xml4
-rw-r--r--res/values-sl/strings.xml4
-rw-r--r--res/values-sr/strings.xml4
-rw-r--r--res/values-sv/strings.xml4
-rw-r--r--res/values-sw/strings.xml4
-rw-r--r--res/values-th/strings.xml4
-rw-r--r--res/values-tl/strings.xml4
-rw-r--r--res/values-tr/strings.xml4
-rw-r--r--res/values-uk/strings.xml4
-rw-r--r--res/values-vi/strings.xml4
-rw-r--r--res/values-zh-rCN/strings.xml4
-rw-r--r--res/values-zh-rTW/strings.xml4
-rw-r--r--res/values-zu/strings.xml4
-rw-r--r--res/values/arrays.xml13
-rw-r--r--res/values/strings.xml12
-rw-r--r--res/xml/camera_preferences.xml6
-rw-r--r--src/com/android/camera/Camera.java11
-rw-r--r--src/com/android/camera/JpegEncodingQualityMappings.java50
-rw-r--r--src/com/android/camera/ui/CamcorderHeadUpDisplay.java1
-rw-r--r--src/com/android/camera/ui/CameraHeadUpDisplay.java1
53 files changed, 5 insertions, 273 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8d51a26..b8f3dd2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -65,10 +65,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Prentgehalte"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfyn"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fyn"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normaal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokus-modus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Outo"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oneindig"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9423ec1..cceaafb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -65,10 +65,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M ፒክስል"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"የምስል ጥራት"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"ልዕለ ጥሩ"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"ጥሩ"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"መደበኛ"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"የማተኮር ሁነታ"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"ራስ"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"ወሰን የሌለው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 18171af..dde4f8e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 ميغا بكسل"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"جودة الصورة"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"جيدة جدًا"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"جيدة"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"عادي"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"وضع التركيز"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"تلقائي"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"بلا نهاية"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f4fa70f..9aa6617 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M пиксела"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Качество на снимка"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Много фино"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Фино"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Нормална"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Фокусен режим"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автоматичен"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Безкрайност"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7a178df..71d3206 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 milió de píxels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualitat d\'imatge"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfina"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fina"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode d\'enfocament"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automàtic"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5487157..60ec479 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kvalita fotografií"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Velmi jemná"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Jemná"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Běžná"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Režim zaostření"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaticky"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nekonečno"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index aa83560..b17f0db 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Billedkvalitet"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfin"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokustilstand"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisk"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Uendelighed"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 48e775f..9197582 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Million Pixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildqualität"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Extrafein"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fein"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokussierungsmodus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisch"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Unendlich"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 84171bc..28ac05c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M εικονοστοιχεία"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Ποιότητα εικόνας"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Πολύ υψηλή"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Λεπτή"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Κανονική"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Λειτουργία εστίασης"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Αυτόματο"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Άπειρο"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 109daf0..9b560f3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -62,10 +62,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M Pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Picture quality"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fine"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fine"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Focus mode"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinity"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d03705a..c6a6951 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M píxeles"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Calidad de la imagen"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Súper fino"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fino"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automáticamente"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 58f5c6d..55e9b3b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Píxeles de 1 M"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Calidad de imagen"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Muy buena"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Buena"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de enfoque"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e45fd66..a3e3432 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"کیفیت تصویر"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"بسیار عالی"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"عالی"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"معمولی"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"حالت فوکوس"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"خودکار"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"بی نهایت"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3bd74ad..a65d34b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapikseli"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kuvan laatu"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Erittäin korkea"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Korkea"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normaali"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Tarkennustila"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automaattinen"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Loputon"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e3767d2..6420f43 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualité d\'image"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Très haute qualité"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Haute qualité"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normale"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode de mise au point"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatique"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infini"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e673621..f1f3469 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M piksela"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kvaliteta slike"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super kvalitetno"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fino"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normalno"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Način fokusa"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatski"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Beskonačno"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3c3c9c2..0af1ede 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Képminőség"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Szuperfinom"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Finom"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normál"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fókuszálás módja"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatikus"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Végtelen"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 06b96f3..2678414 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Piksel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kualitas gambar"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super halus"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Halus"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mode fokus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatis"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Ketakterbatasan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 302866c..5197d87 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Megapixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualità immagine"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fine"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fine"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normale"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modalità messa a fuoco"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatica"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index dc9e2a5..6bc391b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 מגה פיקסלים"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"איכות תמונה"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"איכותי במיוחד"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"איכותי"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"רגיל"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"מצב מיקוד"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"אוטומטי"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"אינסוף"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8824d77..b7c4a53 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1メガピクセル"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"写真の画質"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"スーパーファイン"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"ファイン"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"標準"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"フォーカスモード"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"オート"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"無限遠"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b2d28c4..6eb16ff 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M 픽셀"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"사진 품질"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"최고급"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"고급"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"보통"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"초점 모드"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"자동"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"무한"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a76210d..d75c68d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 mln. pikselių"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Paveikslėlio kokybė"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Itin gera"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Geras"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Įprastas"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusavimo režimas"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatiškai"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Begalybė"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fd9c58d..decf6b4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapikselis"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Attēla kvalitāte"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Ļoti augsta"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Augsta"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normāla"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusa režīms"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automātiski"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Bezgalība"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e934f3c..bda625c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Piksel 1M"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kualiti gambar"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super halus"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Halus"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Biasa"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod fokus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infiniti"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0d205e9..f43b113 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M (1024x768)"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildekvalitet"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Ekstra fin"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusmodus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Autofokus"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Uendelig"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 26a26af..c89a6d7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Fotokwaliteit"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Zeer fijn"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fijn"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normaal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Scherpstelmodus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatisch"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oneindig"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 76c9c14..da52000 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapiksel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Jakość zdjęcia"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Bardzo wysoka"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Wysoka"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normalna"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Tryb ostrości"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatyczny"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nieskończoność"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5bfd3ba..67461c6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualidade de imagem"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fina"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Optimizar"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de focagem"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4ee3737..0dfdf1d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualidade da imagem"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Muito boa"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Boa"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modo de foco"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1105ceb..deb3789 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -66,10 +66,6 @@
<!-- no translation found for pref_camera_picturesize_entry_640x480 (5557572917973022995) -->
<skip />
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Qualitad dal maletg"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Qualitad fitg auta"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Auta qualitad"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Modus da focussar"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatic"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 257b791..dbd0386 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 M pixeli"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Calitatea fotografiei"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Super fin"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normală"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mod focus"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automat"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinit"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e53c90f..05e5170 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 мегапиксель"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Качество фотографий"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Отличное"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Хорошее"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Обычное"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокусировки"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Авто"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бесконечность"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5fdf890..5d8969b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kvalita fotografií"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Veľmi jemná"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Jemná"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normálna"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Režim zaostrenia"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Nekonečno"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bc841ee..62fa408 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 MB slikovnih pik"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kakovost slike"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Najvišja kakovost"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Kakovostno"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Običajna"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Način ostrenja"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Samodejno"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Neskončno"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 77e4de3..810ca28 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 мил пиксела"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Квалитет слике"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Изузетно прецизно"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Прецизно"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Нормалан"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокуса"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Аутоматски"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Бесконачност"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8472f40..5097c71 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 megapixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Bildkvalitet"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Superfin"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Fin"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Fokusläge"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automatiskt"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Oändligt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 802e7a4..06f2ae8 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -65,10 +65,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Pikseli 1M"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Ubora wa picha"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Bora sana"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Bora"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Kawaida"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Hali ya kulenga"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Atomatiki"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Pasipo mwisho"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8180ad9..0d1eaa9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 ล้านพิกเซล"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"คุณภาพของภาพ"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"ความละเอียดสูง"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"ละเอียด"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"ปกติ"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"โหมดโฟกัส"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"อัตโนมัติ"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"อินฟินิตี"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d940b99..9e336e7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixels"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Kalidad ng larawan"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Maayos na maayos"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Maayos"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Focus mode"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Auto"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Walang Katapusan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9375f41..b82a6d2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Piksel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Resim kalitesi"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Çok iyi"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"İyi"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Normal"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Odak modu"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatik"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Sonsuz"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 214984d..4fd0077 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 Мпікс"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Якість фото"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Підвищена"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Добра"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Звичайна"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Режим фокусу"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Автом."</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Безкінечн."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c0f403e..f83a5b6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1M Pixel"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Chất lượng ảnh"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Rất đẹp"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Đẹp"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Thường"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Chế độ tiêu điểm"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Tự động"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Vô cùng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index afe3a5c..5cda84f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百万像素"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"照片质量"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"极精细"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"精细"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"正常"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"对焦方式"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"自动"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"无限远"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d654ab0..0efd9b3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -63,10 +63,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"1 百萬像素"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"相片品質"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"超精細"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"精細"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"適中"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"對焦模式"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"自動"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"無限遠"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0b569c1..f765d8c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -65,10 +65,6 @@
<string name="pref_camera_picturesize_entry_1024x768" msgid="6557686202570581693">"Amaphikseli e-IM"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"i-VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"i-QVGA"</string>
- <string name="pref_camera_jpegquality_title" msgid="6074540285403193970">"Ikhwalithi yesithombe"</string>
- <string name="pref_camera_jpegquality_entry_superfine" msgid="4087830022547613205">"Cocekile"</string>
- <string name="pref_camera_jpegquality_entry_fine" msgid="4474043704802385370">"Kulungile"</string>
- <string name="pref_camera_jpegquality_entry_normal" msgid="1274801937207351293">"Kuvamile"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Imodi yefokhasi"</string>
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Okuzenzakalelayo"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Kwaphakade"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8166592..6ea5d4e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -95,19 +95,6 @@
<item>320x240</item>
</string-array>
- <!-- Camera Preferences JPEG quality dialog box entries -->
- <string-array name="pref_camera_jpegquality_entries" translatable="false">
- <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>superfine</item>
- <item>fine</item>
- <item>normal</item>
- </string-array>
-
<!-- Camera Preferences focus mode dialog box entries -->
<string-array name="pref_camera_focusmode_entries" translatable="false">
<item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f4a1d3..7713e51 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -151,18 +151,6 @@
<string name="pref_camera_picturesize_entry_640x480">VGA</string>
<string name="pref_camera_picturesize_entry_320x240">QVGA</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>
-
- <!-- 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>
-
<!-- Default focus mode setting.-->
<string name="pref_camera_focusmode_default" translatable="false">auto</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c0bd749..62d7764 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -67,12 +67,6 @@
camera:entries="@array/pref_camera_picturesize_entries"
camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
<ListPreference
- camera:key="pref_camera_jpegquality_key"
- camera:defaultValue="@string/pref_camera_jpegquality_default"
- camera:title="@string/pref_camera_jpegquality_title"
- camera:entries="@array/pref_camera_jpegquality_entries"
- camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
- <ListPreference
camera:key="pref_camera_focusmode_key"
camera:defaultValue="@string/pref_camera_focusmode_default"
camera:title="@string/pref_camera_focusmode_title"
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 8f99b23..025021d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -47,6 +47,7 @@ import android.location.Location;
import android.location.LocationManager;
import android.location.LocationProvider;
import android.media.AudioManager;
+import android.media.CameraProfile;
import android.media.ToneGenerator;
import android.net.Uri;
import android.os.Bundle;
@@ -1129,8 +1130,7 @@ public class Camera extends ActivityBase implements View.OnClickListener,
CameraSettings.KEY_RECORD_LOCATION,
CameraSettings.KEY_FOCUS_MODE,
CameraSettings.KEY_EXPOSURE,
- CameraSettings.KEY_PICTURE_SIZE,
- CameraSettings.KEY_JPEG_QUALITY};
+ CameraSettings.KEY_PICTURE_SIZE};
mIndicatorWheel.initialize(this, mPreferenceGroup, SETTING_KEYS,
OTHER_SETTING_KEYS);
mIndicatorWheel.setListener(new MyIndicatorWheelListener());
@@ -2024,10 +2024,9 @@ public class Camera extends ActivityBase implements View.OnClickListener,
}
// Set JPEG quality.
- String jpegQuality = mPreferences.getString(
- CameraSettings.KEY_JPEG_QUALITY,
- getString(R.string.pref_camera_jpegquality_default));
- mParameters.setJpegQuality(JpegEncodingQualityMappings.getQualityNumber(jpegQuality));
+ int jpegQuality = CameraProfile.getJpegEncodingQualityParameter(mCameraId,
+ CameraProfile.QUALITY_HIGH);
+ mParameters.setJpegQuality(jpegQuality);
// For the following settings, we need to check if the settings are
// still supported by latest driver, if not, ignore the settings.
diff --git a/src/com/android/camera/JpegEncodingQualityMappings.java b/src/com/android/camera/JpegEncodingQualityMappings.java
deleted file mode 100644
index 8b8fb08..0000000
--- a/src/com/android/camera/JpegEncodingQualityMappings.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera;
-
-import android.media.CameraProfile;
-import android.util.Log;
-
-import java.util.HashMap;
-
-/*
- * Provide a mapping for Jpeg encoding quality levels
- * from String representation to numeric representation.
- */
-public class JpegEncodingQualityMappings {
- private static final String TAG = "JpegEncodingQualityMappings";
- private static final int DEFAULT_QUALITY = 85;
- private static HashMap<String, Integer> mHashMap =
- new HashMap<String, Integer>();
-
- static {
- mHashMap.put("normal", CameraProfile.QUALITY_LOW);
- mHashMap.put("fine", CameraProfile.QUALITY_MEDIUM);
- mHashMap.put("superfine", CameraProfile.QUALITY_HIGH);
- }
-
- // Retrieve and return the Jpeg encoding quality number
- // for the given quality level.
- public static int getQualityNumber(String jpegQuality) {
- Integer quality = mHashMap.get(jpegQuality);
- if (quality == null) {
- Log.w(TAG, "Unknown Jpeg quality: " + jpegQuality);
- return DEFAULT_QUALITY;
- }
- return CameraProfile.getJpegEncodingQualityParameter(quality.intValue());
- }
-}
diff --git a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
index 54f1da3..7268e3a 100644
--- a/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CamcorderHeadUpDisplay.java
@@ -48,7 +48,6 @@ public class CamcorderHeadUpDisplay extends HeadUpDisplay {
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_SCENE_MODE,
CameraSettings.KEY_PICTURE_SIZE,
- CameraSettings.KEY_JPEG_QUALITY,
CameraSettings.KEY_COLOR_EFFECT);
mOtherSettings = new OtherSettingsIndicator(context, prefs);
diff --git a/src/com/android/camera/ui/CameraHeadUpDisplay.java b/src/com/android/camera/ui/CameraHeadUpDisplay.java
index b3c5ea0..500d09e 100644
--- a/src/com/android/camera/ui/CameraHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CameraHeadUpDisplay.java
@@ -55,7 +55,6 @@ public class CameraHeadUpDisplay extends HeadUpDisplay {
CameraSettings.KEY_EXPOSURE,
CameraSettings.KEY_SCENE_MODE,
CameraSettings.KEY_PICTURE_SIZE,
- CameraSettings.KEY_JPEG_QUALITY,
CameraSettings.KEY_COLOR_EFFECT,
CameraSettings.KEY_RECORD_LOCATION);