Remove quick capture UI. It is not used.

Change-Id: Ie087afba5633304c71ca5f72276d16f620931869

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9323351..3366a4f 100644 (file)
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -101,9 +101,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 fe29540..8540244 100644 (file)
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -101,9 +101,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 19c3531..2354e4c 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -101,9 +101,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 bdb816d..8fd8e4d 100644 (file)
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -101,9 +101,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 d5f7051..385a0c3 100644 (file)
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -101,9 +101,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 0118035..9a470a8 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -101,9 +101,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 f265c3b..647446c 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -101,9 +101,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 736aec5..e1a2c54 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -101,9 +101,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 66ea853..43280c5 100644 (file)
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -101,9 +101,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 a9d03b6..67a6751 100644 (file)
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -101,9 +101,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 8194709..46d0263 100644 (file)
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -101,9 +101,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 d403b2a..dc820f2 100644 (file)
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -101,9 +101,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 0361af8..73eb3b1 100644 (file)
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -101,9 +101,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 c3074e0..d85b463 100644 (file)
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -101,9 +101,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 eea0d90..ead52f2 100644 (file)
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -101,9 +101,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 8a02a6f..2dd6765 100644 (file)
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -101,9 +101,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 8eb708f..dc89cb1 100644 (file)
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -101,9 +101,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 e3649ff..ff82a86 100644 (file)
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -101,9 +101,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 91f2c7c..c420985 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -101,9 +101,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 daa5463..655e1fb 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -101,9 +101,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 2299935..65a32a9 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -252,14 +252,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 e1e37d9..c920a31 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -251,12 +251,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 (file)
--- 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 3059a56..565b537 100644 (file)
--- 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();
         /*
@@ -2140,7 +2136,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
 
         recordLocation = RecordLocationPreference.get(
                 mPreferences, getContentResolver());
-        mQuickCapture = getQuickCaptureSettings();
 
         if (mRecordLocation != recordLocation) {
             mRecordLocation = recordLocation;
@@ -2154,13 +2149,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 8eef3e9..3bebb93 100644 (file)
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -46,13 +46,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";