summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-cs/strings.xml3
-rw-r--r--res/values-da/strings.xml3
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-el/strings.xml3
-rw-r--r--res/values-es-rUS/strings.xml3
-rw-r--r--res/values-es/strings.xml3
-rw-r--r--res/values-fr/strings.xml3
-rw-r--r--res/values-it/strings.xml3
-rw-r--r--res/values-ja/strings.xml3
-rw-r--r--res/values-ko/strings.xml3
-rw-r--r--res/values-nb/strings.xml3
-rw-r--r--res/values-nl/strings.xml3
-rw-r--r--res/values-pl/strings.xml3
-rw-r--r--res/values-pt-rPT/strings.xml3
-rw-r--r--res/values-pt/strings.xml3
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-sv/strings.xml3
-rw-r--r--res/values-tr/strings.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
-rw-r--r--res/values-zh-rTW/strings.xml3
-rw-r--r--res/values/arrays.xml10
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/camera_preferences.xml6
-rw-r--r--src/com/android/camera/Camera.java14
-rw-r--r--src/com/android/camera/CameraSettings.java4
25 files changed, 1 insertions, 99 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 082b475..d6158b8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Západ slunce"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Nehybná fotografie"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Ohňostroj"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Okamžitý záznam"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Zapnout"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Vypnout"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Nastavení fotoaparátu"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Obnovit výchozí nastavení"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Expozice"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 413701b..3e16f3e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Roligt foto"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrværkeri"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hurtig fotografering"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Til"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Fra"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Indstillinger for kamera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Gendan til standarder"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d8849cc..8c1d821 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Sonnenuntergang"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabilisierung"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Feuerwerk"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ein"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Aus"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Kameraeinstellungen"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Standard wiederherstellen"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Belichtung"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 9852295..5096380 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ηλιοβασίλεμα"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Σταθερή φωτογραφία"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Πυροτεχνήματα"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Γρήγορη λήψη"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ενεργοποίηση"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Απενεργοποίηση"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Επαναφορά στις προεπιλογές"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8d49def..9e0f7d2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Crepúsculo"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto fija"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuegos artificiales"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Encendido"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Apagado"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a configuraciones predeterminadas"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 257e838..558927c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Atardecer"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto fija"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuegos artificiales"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activada"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desactivada"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a los valores predeterminados"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 11cfa20..2c3df80 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Coucher de soleil"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Anti-flou"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Feux d\'artifice"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Capture rapide"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activée"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Désactivée"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Paramètres de l\'appareil photo"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Rétablir les paramètres par défaut"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8c401f5..834db4c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Tramonto"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabilizzazione foto"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fuochi d\'artificio"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Attivo"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Non attivo"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Impostazioni fotocamera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Ripristina predefinite"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Esposizione"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fd13fff..0c20e6d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"夕日"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"手振れ補正"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"花火"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"クイックキャプチャ"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"ON"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"OFF"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"カメラ設定"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"初期設定に戻す"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"露出"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index abd8d27..3270dd7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"일몰"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"손떨림 방지 사진"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"불꽃놀이"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"웹캠으로 바로 올리기"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"사용"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"사용 안함"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"카메라 설정"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"기본값으로 복원"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"노출"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 615c7bf..62c5f50 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgang"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stødig foto"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrverkeri"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hurtigbilde"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"På"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Av"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Kamerainnstillinger"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Gjenopprett til standardinnstillingene"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 39c94aa..b663be2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zonsondergang"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stabiele foto"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Vuurwerk"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Quick Capture"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Aan"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Uit"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Camera-instellingen"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Terugzetten naar standaardwaarden"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 16fae95..858a310 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Zachód słońca"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Statyczne zdjęcie"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Sztuczne ognie"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Szybkie robienie zdjęć"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Włączone"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Wyłączone"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Ustawienia aparatu"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Przywróć wartości domyślne"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozycja"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ef8d331..de14257 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Ocaso"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Fotografia uniforme"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fogo-de-artifício"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Activada"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desactivada"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Definições da câmara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para valores predefinidos"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 11c36d4..df3ae41 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Pôr-do-sol"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Foto nítida"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fogos de artifício"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Captura rápida"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Ativado"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Desativado"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Configurações da câmera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para os valores padrão"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7be49d3..66e5923 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Закат"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Четкость"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Фейерверк"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Запись с камеры"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Вкл."</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Выкл."</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Настройки камеры"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Заводские настройки"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Экспозиция"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 53fa5c8..9c5de46 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Solnedgång"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Stadigt foto"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Fyrverkerier"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Snabbtagning"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"På"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Av"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Kamerainställningar"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Återställ standardvärden"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exponering"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6f06f52..8ee3446 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"Gün batımı"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"Sabit fotoğraf"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"Havai fişekler"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"Hızlı yakala"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"Açık"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"Kapalı"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"Kamera ayarları"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Varsayılan değerleri geri yükle"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Pozlama"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 991d58d..0cfe7fa 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"日落"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"防抖"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"烟火"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"快速拍摄"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"开"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"关"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"相机设置"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"还原为默认设置"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4646112..ee87fd5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -111,9 +111,6 @@
<string name="pref_camera_scenemode_entry_sunset" msgid="181661154611507212">"黃昏"</string>
<string name="pref_camera_scenemode_entry_steadyphoto" msgid="5751266665823209065">"防手震"</string>
<string name="pref_camera_scenemode_entry_fireworks" msgid="3530608172188797432">"煙火"</string>
- <string name="pref_camera_quickcapture_title" msgid="1839831697232292196">"快速錄製"</string>
- <string name="pref_camera_quickcapture_entry_on" msgid="1940258136944434407">"開啟"</string>
- <string name="pref_camera_quickcapture_entry_off" msgid="5000775068226508567">"關閉"</string>
<string name="pref_restore_title" msgid="6479274979730178961">"相機設定"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"還原成預設值"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4a00e05..da5e8c4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -274,14 +274,4 @@
<item>steadyphoto</item>
<item>fireworks</item>
</string-array>
-
- <string-array name="pref_camera_quickcapture_entries" translatable="false">
- <item>@string/pref_camera_quickcapture_entry_off</item>
- <item>@string/pref_camera_quickcapture_entry_on</item>
- </string-array>
-
- <string-array name="pref_camera_quickcapture_entryvalues" translatable="false">
- <item>off</item>
- <item>on</item>
- </string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eeb432d..b78c85b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -273,12 +273,6 @@
<!-- Scene mode optimized for taking images of fireworks. -->
<string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
- <!-- Settings menu, enable quick capture mode or not -->
- <string name="pref_camera_quickcapture_title">Quick capture</string>
- <string name="pref_camera_quickcapture_default" translatable="false">off</string>
- <string name="pref_camera_quickcapture_entry_on">On</string>
- <string name="pref_camera_quickcapture_entry_off">Off</string>
-
<!-- Restore settings item in preference -->
<string name="pref_restore_title">Camera settings</string>
<string name="pref_restore_detail">Restore to defaults</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index c70c253..b0da97c 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -75,11 +75,5 @@
camera:title="@string/pref_camera_focusmode_title"
camera:entries="@array/pref_camera_focusmode_entries"
camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
- <ListPreference
- camera:key="pref_camera_quickcapture_key"
- camera:defaultValue="@string/pref_camera_quickcapture_default"
- camera:title="@string/pref_camera_quickcapture_title"
- camera:entries="@array/pref_camera_quickcapture_entries"
- camera:entryValues="@array/pref_camera_quickcapture_entryvalues" />
</PreferenceGroup>
</PreferenceGroup>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index ad5045a..a256e3b 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -227,7 +227,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
private String mSceneMode;
private final Handler mHandler = new MainHandler();
- private boolean mQuickCapture;
private CameraHeadUpDisplay mHeadUpDisplay;
// multiple cameras support
@@ -630,7 +629,7 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
// We want to show the taken picture for a while, so we wait
// for at least 1.2 second before restarting the preview.
long delay = 1200 - mPictureDisplayedToJpegCallbackTime;
- if (delay < 0 || mQuickCapture) {
+ if (delay < 0) {
restartPreview();
} else {
mHandler.sendEmptyMessageDelayed(RESTART_PREVIEW, delay);
@@ -901,9 +900,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
mNumberOfCameras = CameraHolder.instance().getNumberOfCameras();
- // comment out -- unused now.
- //mQuickCapture = getQuickCaptureSettings();
-
// we need to reset exposure for the preview
resetExposureCompensation();
/*
@@ -2093,7 +2089,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
recordLocation = RecordLocationPreference.get(
mPreferences, getContentResolver());
- mQuickCapture = getQuickCaptureSettings();
if (mRecordLocation != recordLocation) {
mRecordLocation = recordLocation;
@@ -2107,13 +2102,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE);
}
- private boolean getQuickCaptureSettings() {
- String value = mPreferences.getString(
- CameraSettings.KEY_QUICK_CAPTURE,
- getString(R.string.pref_camera_quickcapture_default));
- return CameraSettings.QUICK_CAPTURE_ON.equals(value);
- }
-
@Override
public void onUserInteraction() {
super.onUserInteraction();
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index d718b45..9345029 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -47,13 +47,9 @@ public class CameraSettings {
public static final String KEY_COLOR_EFFECT = "pref_camera_coloreffect_key";
public static final String KEY_WHITE_BALANCE = "pref_camera_whitebalance_key";
public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
- public static final String KEY_QUICK_CAPTURE = "pref_camera_quickcapture_key";
public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
public static final String KEY_CAMERA_ID = "pref_camera_id";
- public static final String QUICK_CAPTURE_ON = "on";
- public static final String QUICK_CAPTURE_OFF = "off";
-
private static final String VIDEO_QUALITY_HIGH = "high";
private static final String VIDEO_QUALITY_MMS = "mms";
private static final String VIDEO_QUALITY_YOUTUBE = "youtube";
generated by cgit v1.1 at 2025-08-16 04:37:43 +0000