From 90a47a4029b033d02d0eada44f1da0d64a30d08d Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 8 Nov 2012 22:59:44 +0000
Subject: [PATCH] Possibly final changes for automatic torch settings

git-svn-id: https://zxing.googlecode.com/svn/trunk@2506 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/values-ar/strings.xml             |  3 ++
 android/res/values-bg/strings.xml             |  3 ++
 android/res/values-ca/strings.xml             |  3 ++
 android/res/values-cs/strings.xml             |  3 ++
 android/res/values-da/strings.xml             |  3 ++
 android/res/values-de/strings.xml             |  3 ++
 android/res/values-el/strings.xml             |  3 ++
 android/res/values-es/strings.xml             |  3 ++
 android/res/values-eu/strings.xml             |  3 ++
 android/res/values-fi/strings.xml             |  3 ++
 android/res/values-fr/strings.xml             |  3 ++
 android/res/values-he/strings.xml             |  3 ++
 android/res/values-hi/strings.xml             |  3 ++
 android/res/values-hu/strings.xml             |  3 ++
 android/res/values-id/strings.xml             |  3 ++
 android/res/values-it/strings.xml             |  3 ++
 android/res/values-iw/strings.xml             |  3 ++
 android/res/values-ja/strings.xml             |  3 ++
 android/res/values-ko/strings.xml             |  3 ++
 android/res/values-nl/strings.xml             |  3 ++
 android/res/values-pl/strings.xml             |  3 ++
 android/res/values-pt/strings.xml             |  3 ++
 android/res/values-ru/strings.xml             |  3 ++
 android/res/values-sk/strings.xml             |  6 ++-
 android/res/values-sl/strings.xml             |  3 ++
 android/res/values-sv/strings.xml             |  3 ++
 android/res/values-tr/strings.xml             |  3 ++
 android/res/values-zh-rCN/strings.xml         |  3 ++
 android/res/values-zh-rTW/strings.xml         |  3 ++
 android/res/values/arrays.xml                 | 10 +++++
 android/res/values/strings.xml                |  3 ++
 android/res/xml/preferences.xml               |  8 ++--
 .../client/android/AmbientLightManager.java   | 16 ++++---
 .../zxing/client/android/CaptureActivity.java |  4 +-
 .../client/android/PreferencesActivity.java   |  2 +-
 .../camera/CameraConfigurationManager.java    | 23 +++++-----
 .../client/android/camera/CameraManager.java  |  2 +-
 .../client/android/camera/FrontLightMode.java | 42 +++++++++++++++++++
 38 files changed, 176 insertions(+), 24 deletions(-)
 create mode 100644 android/src/com/google/zxing/client/android/camera/FrontLightMode.java

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 178378f98..7c38c26dd 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">استخدام وضع معيار التركيز فقط</string>
   <string name="preferences_disable_continuous_focus_title">لا التركيز المستمر</string>
   <string name="preferences_disable_exposure_title">لا تعرض</string>
+  <string name="preferences_front_light_auto">أوتوماتيكي</string>
+  <string name="preferences_front_light_off">غير فعال</string>
+  <string name="preferences_front_light_on">نشط</string>
   <string name="preferences_front_light_summary">تقوم بتحسين عملية المسح في إضاءة ضعيفة في بعض الهواتف، ولكن يمكن أن يتسبب في حدوث سطوع</string>
   <string name="preferences_front_light_title">استخدم إضاءة أمامية</string>
   <string name="preferences_general_title">إعدادات عامة</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index e14dd6b45..8b238c2f6 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Използване само на стандартен режим за фокусиране</string>
   <string name="preferences_disable_continuous_focus_title">Без непрекъснат фокус</string>
   <string name="preferences_disable_exposure_title">Никоя експозиция</string>
+  <string name="preferences_front_light_auto">Автоматичен</string>
+  <string name="preferences_front_light_off">Неактивен</string>
+  <string name="preferences_front_light_on">Активен</string>
   <string name="preferences_front_light_summary">Подобрява четенето при лошо осветление, но предизвиква отблясъци. Само за някои модели.</string>
   <string name="preferences_front_light_title">Използвай фенерче</string>
   <string name="preferences_general_title">Общи настройки</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 9e1127b4a..4484bbd09 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Utilitzeu només la manera d\'enfocament estàndard</string>
   <string name="preferences_disable_continuous_focus_title">No enfocament continu</string>
   <string name="preferences_disable_exposure_title">No hi ha exposició</string>
+  <string name="preferences_front_light_auto">Automàtic</string>
+  <string name="preferences_front_light_off">Inactiu</string>
+  <string name="preferences_front_light_on">Actiu</string>
   <string name="preferences_front_light_summary">Millora l\'escaneig amb poca llum en alguns dispositius, però pot produir enlluernament. No funciona en tots els dispositius.</string>
   <string name="preferences_front_light_title">Usa el llum frontal</string>
   <string name="preferences_general_title">Configuració general</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index d6af7eeb7..1d22ac8ff 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Používejte pouze standardní zaostřování</string>
   <string name="preferences_disable_continuous_focus_title">Soustavné zaměření</string>
   <string name="preferences_disable_exposure_title">No expozice</string>
+  <string name="preferences_front_light_auto">Automatický</string>
+  <string name="preferences_front_light_off">Neaktivní</string>
+  <string name="preferences_front_light_on">Aktivní</string>
   <string name="preferences_front_light_summary">Zlepšuje skenování při slabém osvětlení na některých telefonech, ale může způsobit oslnění. Nefunguje na všech telefonech.</string>
   <string name="preferences_front_light_title">Použít světlo</string>
   <string name="preferences_general_title">Hlavní nastavení</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 411147243..cff3aec6a 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Brug kun standard fokusindstilling</string>
   <string name="preferences_disable_continuous_focus_title">Ingen løbende fokus</string>
   <string name="preferences_disable_exposure_title">Ingen eksponering</string>
+  <string name="preferences_front_light_auto">Automatisk</string>
+  <string name="preferences_front_light_off">Inaktiv</string>
+  <string name="preferences_front_light_on">Aktiv</string>
   <string name="preferences_front_light_summary">Forbedrer aflæsning i svagt lys på nogle telefoner, men kan medføre genskær. Virker ikke på alle telefoner.</string>
   <string name="preferences_front_light_title">Brug frontlys</string>
   <string name="preferences_general_title">Generelle indstillinger</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 2b7b31e6b..a56089570 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Nur Standard-Fokus-Modus verwenden</string>
   <string name="preferences_disable_continuous_focus_title">Kein kontinuierlicher Fokus</string>
   <string name="preferences_disable_exposure_title">Keine Belichtungsmessung </string>
+  <string name="preferences_front_light_auto">Automatisch</string>
+  <string name="preferences_front_light_off">Inaktiv</string>
+  <string name="preferences_front_light_on">Aktiv</string>
   <string name="preferences_front_light_summary">Verbessert bei einigen Mobiltelefonen das Scannen bei schwachem Licht, kann aber Überbelichtung verursachen. Funktioniert nicht mit allen Handys.</string>
   <string name="preferences_front_light_title">Foto LED einschalten</string>
   <string name="preferences_general_title">Allgemeine Einstellungen</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index f707adc7c..fce867037 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Χρησιμοποιείτε μόνο τυπική λειτουργία εστίασης</string>
   <string name="preferences_disable_continuous_focus_title">Δεν συνεχής εστίαση</string>
   <string name="preferences_disable_exposure_title">Δεν έκθεση</string>
+  <string name="preferences_front_light_auto">Αυτόματο</string>
+  <string name="preferences_front_light_off">Αδρανής</string>
+  <string name="preferences_front_light_on">Ενεργός</string>
   <string name="preferences_front_light_summary">Βελτιώνει το σκανάρισμα με χαμηλο φωτισμό σε μερικά κινητά, ίσως όμως προκαλέσει λάμψη. Δουλεύει σε μερικά κινητά.</string>
   <string name="preferences_front_light_title">Χρήση μπροστινού φακού</string>
   <string name="preferences_general_title">Γενικές ρυθμίσεις</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index fa48335ff..c6b095c04 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Utilice sólo el modo de enfoque estándar</string>
   <string name="preferences_disable_continuous_focus_title">No enfoque continuo</string>
   <string name="preferences_disable_exposure_title">No exposición</string>
+  <string name="preferences_front_light_auto">Automático</string>
+  <string name="preferences_front_light_off">Inactivo</string>
+  <string name="preferences_front_light_on">Activo</string>
   <string name="preferences_front_light_summary">Mejora la exploración en condiciones de poca luz en algunos teléfonos, pero puede causar deslumbramiento. No funciona en todos los teléfonos.</string>
   <string name="preferences_front_light_title">Utilizar luz delantera</string>
   <string name="preferences_general_title">Configuración general</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 52dfb9dab..64a556344 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Erabili estandarrean soilik fokuaren modua</string>
   <string name="preferences_disable_continuous_focus_title">Etengabeko foku No</string>
   <string name="preferences_disable_exposure_title">Esposizio No</string>
+  <string name="preferences_front_light_auto">Automatikoa</string>
+  <string name="preferences_front_light_off">Ezgaitutako</string>
+  <string name="preferences_front_light_on">Aktiboak</string>
   <string name="preferences_front_light_summary">Eskaneatzea hobetzen du zenbait telefonotan argiztapena txikia denean, baina distirak eragin ditzake. Ez du telefono guztietan funtzionatzen.</string>
   <string name="preferences_front_light_title">Erabili aurreko argia</string>
   <string name="preferences_general_title">Ezarpen orokorrak</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 500133f56..6d32d9388 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Käytä vain vakiotarkennusta</string>
   <string name="preferences_disable_continuous_focus_title">Ei jatkuvaa tarkennusta</string>
   <string name="preferences_disable_exposure_title">Ei valotusta</string>
+  <string name="preferences_front_light_auto">Automaattinen</string>
+  <string name="preferences_front_light_off">Toimeton</string>
+  <string name="preferences_front_light_on">Aktiivinen</string>
   <string name="preferences_front_light_summary">Salamavalon käyttö saattaa auttaa hämärässä, mutta se saattaa aiheuttaa myös häikäisyä. Ei toimi kaikissa puhelimissa.</string>
   <string name="preferences_front_light_title">Käytä valoa</string>
   <string name="preferences_general_title">Yleiset asetukset</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 6df801bba..45f256179 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Utiliser uniquement le mode de mise au point standard</string>
   <string name="preferences_disable_continuous_focus_title">Pas de mise au point continue</string>
   <string name="preferences_disable_exposure_title">Pas d\'exposition</string>
+  <string name="preferences_front_light_auto">Automatique</string>
+  <string name="preferences_front_light_off">Inactif</string>
+  <string name="preferences_front_light_on">Actif</string>
   <string name="preferences_front_light_summary">Allumer la lampe derrière le téléphone quand la lumière ambiante est faible. Peut provoquer des reflets et ne fonctionne pas sur tous les téléphones.</string>
   <string name="preferences_front_light_title">Flash</string>
   <string name="preferences_general_title">Paramètres généraux</string>
diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml
index dcdb9b06c..ab07537ad 100755
--- a/android/res/values-he/strings.xml
+++ b/android/res/values-he/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>
   <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
   <string name="preferences_disable_exposure_title">אין חשיפה</string>
+  <string name="preferences_front_light_auto">אוטומטי</string>
+  <string name="preferences_front_light_off">לא פעיל</string>
+  <string name="preferences_front_light_on">פעיל</string>
   <string name="preferences_front_light_summary">משפר את הסריקה בתאורה נמוכה בטלפונים מסוימים, אך עשוי לגרום לסנוור. לא עובד בכל הטלפונים.</string>
   <string name="preferences_front_light_title">השתמש באור הקדמי</string>
   <string name="preferences_general_title">הגדרות כלליות</string>
diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml
index 81497c38c..3eb5db856 100644
--- a/android/res/values-hi/strings.xml
+++ b/android/res/values-hi/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">केवल मानक फोकस मोड का उपयोग करें</string>
   <string name="preferences_disable_continuous_focus_title">कोई निरंतर ध्यान</string>
   <string name="preferences_disable_exposure_title">कोई जोखिम</string>
+  <string name="preferences_front_light_auto">स्वचालित</string>
+  <string name="preferences_front_light_off">निष्क्रिय</string>
+  <string name="preferences_front_light_on">सक्रिय</string>
   <string name="preferences_front_light_summary">कुछ फोन पर कम रोशनी में स्कैनिंग बढ़ाता है, लेकिन चमक का कारण हो सकता है. सभी फोन पर काम नहीं करता.</string>
   <string name="preferences_front_light_title">सामने प्रकाश का उपयोग करें</string>
   <string name="preferences_general_title">सामान्य सेटिंग्स</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 505d84a93..1f89ab4c7 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Csak a normál élességállítási mód</string>
   <string name="preferences_disable_continuous_focus_title">Nincs folyamatos fókusz</string>
   <string name="preferences_disable_exposure_title">No expozíció</string>
+  <string name="preferences_front_light_auto">Automatikus</string>
+  <string name="preferences_front_light_off">Tétlen</string>
+  <string name="preferences_front_light_on">Aktív</string>
   <string name="preferences_front_light_summary">Javítja a szkennelést kevés fény mellett néhány telefonon, de csillogást okozhat. Nem minden telefonon működik.</string>
   <string name="preferences_front_light_title">Kamera LED használata</string>
   <string name="preferences_general_title">Általános beállítások</string>
diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml
index ab3b9ff62..669a3fc6d 100644
--- a/android/res/values-id/strings.xml
+++ b/android/res/values-id/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Gunakan hanya modus fokus standar</string>
   <string name="preferences_disable_continuous_focus_title">Tidak ada fokus terus menerus</string>
   <string name="preferences_disable_exposure_title">Eksposur ada</string>
+  <string name="preferences_front_light_auto">Otomatis</string>
+  <string name="preferences_front_light_off">Non-aktif</string>
+  <string name="preferences_front_light_on">Aktif</string>
   <string name="preferences_front_light_summary">Meningkatkan scanning dalam cahaya rendah pada beberapa ponsel, namun dapat menyebabkan silau. Tidak bekerja pada semua ponsel.</string>
   <string name="preferences_front_light_title">Gunakan lampu depan</string>
   <string name="preferences_general_title">Pengaturan umum</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 97b34fd9e..55e6a27b2 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Utilizzare solo modalità standard messa a fuoco</string>
   <string name="preferences_disable_continuous_focus_title">No continua attenzione</string>
   <string name="preferences_disable_exposure_title">Nessuna esposizione</string>
+  <string name="preferences_front_light_auto">Automatico</string>
+  <string name="preferences_front_light_off">Inattivo</string>
+  <string name="preferences_front_light_on">Attivo</string>
   <string name="preferences_front_light_summary">Migliora la scansione con poca luminosità su alcuni telefoni, ma può provocare abbagliamento. Non funziona su tutti i telefoni.</string>
   <string name="preferences_front_light_title">Usa luce frontale</string>
   <string name="preferences_general_title">Impostazioni generali</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index dcdb9b06c..ab07537ad 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>
   <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
   <string name="preferences_disable_exposure_title">אין חשיפה</string>
+  <string name="preferences_front_light_auto">אוטומטי</string>
+  <string name="preferences_front_light_off">לא פעיל</string>
+  <string name="preferences_front_light_on">פעיל</string>
   <string name="preferences_front_light_summary">משפר את הסריקה בתאורה נמוכה בטלפונים מסוימים, אך עשוי לגרום לסנוור. לא עובד בכל הטלפונים.</string>
   <string name="preferences_front_light_title">השתמש באור הקדמי</string>
   <string name="preferences_general_title">הגדרות כלליות</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index d49c2439a..c6a69a2ae 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">標準フォーカスモードのみ使用します</string>
   <string name="preferences_disable_continuous_focus_title">連続フォーカスしない</string>
   <string name="preferences_disable_exposure_title">露出しない</string>
+  <string name="preferences_front_light_auto">自動</string>
+  <string name="preferences_front_light_off">非アクティブな</string>
+  <string name="preferences_front_light_on">アクティブ</string>
   <string name="preferences_front_light_summary">暗い場所でのスキャンを向上させるためフロントライトを有効にします</string>
   <string name="preferences_front_light_title">フロントライト</string>
   <string name="preferences_general_title">一般設定</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 585739cfe..48ba5f07f 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">전용 표준 초점 모드를 사용</string>
   <string name="preferences_disable_continuous_focus_title">아무 연속 초점 없음</string>
   <string name="preferences_disable_exposure_title">더 노출하지</string>
+  <string name="preferences_front_light_auto">자동적 인</string>
+  <string name="preferences_front_light_off">비활성</string>
+  <string name="preferences_front_light_on">활동적인</string>
   <string name="preferences_front_light_summary">특정 기기에서는 어두운 환경에서의 스캐닝 기능을 향상 시키지만 너무 밝을 수도 있습니다. 모든 기기에서 작동되지 않습니다.</string>
   <string name="preferences_front_light_title">플래시 사용하기</string>
   <string name="preferences_general_title">일반 설정</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 6f41bbf17..66f6e7a8d 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Gebruik alleen standaard focus modus</string>
   <string name="preferences_disable_continuous_focus_title">Geen continue focus</string>
   <string name="preferences_disable_exposure_title">Geen blootstelling</string>
+  <string name="preferences_front_light_auto">Automatisch</string>
+  <string name="preferences_front_light_off">Inactieve</string>
+  <string name="preferences_front_light_on">Actief</string>
   <string name="preferences_front_light_summary">Verbetert het scannen bij weinig licht bij sommige telefoons, maar kan schittering veroorzaken. Werkt niet op alle telefoons.</string>
   <string name="preferences_front_light_title">Flitser gebruiken</string>
   <string name="preferences_general_title">Algemene instellingen</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 344563b94..89e3fcdf4 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Używaj tylko standardowego trybu ostrości</string>
   <string name="preferences_disable_continuous_focus_title">Nie ciągły nacisk</string>
   <string name="preferences_disable_exposure_title">Żadna ekspozycja</string>
+  <string name="preferences_front_light_auto">Automatyczny</string>
+  <string name="preferences_front_light_off">Nieaktywny</string>
+  <string name="preferences_front_light_on">Aktywny</string>
   <string name="preferences_front_light_summary">Polepsza skanowanie przy małej ilości światła w niektórych telefonach, ale może powodować odbłysk. Nie działa na wszystkich telefonach.</string>
   <string name="preferences_front_light_title">Używaj lampy frontowej</string>
   <string name="preferences_general_title">Ustawienia ogólne</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 40827ee12..a4da3ee00 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Use apenas o modo de focagem padrão</string>
   <string name="preferences_disable_continuous_focus_title">No foco contínuo</string>
   <string name="preferences_disable_exposure_title">Nenhuma exposição</string>
+  <string name="preferences_front_light_auto">Automático</string>
+  <string name="preferences_front_light_off">Inativo</string>
+  <string name="preferences_front_light_on">Ativo</string>
   <string name="preferences_front_light_summary">Melhora a leitura em luz fraca em alguns telefones, mas pode causar clarões. Não disponível em certos dispositivos.</string>
   <string name="preferences_front_light_title">Usar luz da frente</string>
   <string name="preferences_general_title">Definições Gerais</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index bc1b5f8ef..58939027f 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Используйте только стандартный режим фокусировки</string>
   <string name="preferences_disable_continuous_focus_title">Нет постоянное внимание</string>
   <string name="preferences_disable_exposure_title">Нет экспозиции</string>
+  <string name="preferences_front_light_auto">Автоматический</string>
+  <string name="preferences_front_light_off">Неактивный</string>
+  <string name="preferences_front_light_on">Активный</string>
   <string name="preferences_front_light_summary">Улучшает распознавание в условиях низкой освещенности, но может вызвать блики. Работает не на всех устройствах.</string>
   <string name="preferences_front_light_title">Фонарик</string>
   <string name="preferences_general_title">Общие настройки</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 32496fd6a..c86126470 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -105,7 +105,11 @@
   <string name="preferences_disable_continuous_focus_summary">Použiť iba štandardné zaostrenie</string>
   <string name="preferences_disable_continuous_focus_title">Nezaostrovať nepretržite</string>
   <string name="preferences_disable_exposure_title">Bez expozície</string>
-  <string name="preferences_front_light_summary">Na niektorých zariadeniach zlepšuje snímanie za zhoršených svetelných podmienok, ale môže spôsobiť odlesk. Nefunguje na všetkých zariadeniach.</string>  <string name="preferences_front_light_title">Použiť prisvetlenie</string>
+  <string name="preferences_front_light_auto">Automatický</string>
+  <string name="preferences_front_light_off">Neaktívne</string>
+  <string name="preferences_front_light_on">Aktívne</string>
+  <string name="preferences_front_light_summary">Použiť prisvetlenie</string>
+  <string name="preferences_front_light_title">Použite predné svetlo</string>
   <string name="preferences_general_title">Všeobecné nastavenia</string>
   <string name="preferences_name">Nastavenia</string>
   <string name="preferences_play_beep_title">Zvuková signalizácia</string>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index ff485d6ad..4303b576c 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Uporabljajte samo standardni način ostrenja</string>
   <string name="preferences_disable_continuous_focus_title">Št stalna osredotočenost</string>
   <string name="preferences_disable_exposure_title">Nobena izpostavljenost</string>
+  <string name="preferences_front_light_auto">Samodejno</string>
+  <string name="preferences_front_light_off">Neaktivno</string>
+  <string name="preferences_front_light_on">Aktivna</string>
   <string name="preferences_front_light_summary">Izboljša branje pri slabi svetlobi na nekaterih telefonih, a lahko povzroči blesk. Ne deluje na vseh telefonih.</string>
   <string name="preferences_front_light_title">Uporabite sprednjo luč</string>
   <string name="preferences_general_title">Splošne nastavitve</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index a84a49dc8..cca5307ed 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Använd endast standardfokusläge</string>
   <string name="preferences_disable_continuous_focus_title">Ingen kontinuerlig fokus</string>
   <string name="preferences_disable_exposure_title">Ingen exponering</string>
+  <string name="preferences_front_light_auto">Automatisk</string>
+  <string name="preferences_front_light_off">Inaktiv</string>
+  <string name="preferences_front_light_on">Aktiv</string>
   <string name="preferences_front_light_summary">Förbättrar inskanning i svag belysing på vissa telefoner, men kan orsaka bländning. Ej tillgängligt på vissa enheter.</string>
   <string name="preferences_front_light_title">Använd frontljus</string>
   <string name="preferences_general_title">Grundläggande inställningar</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 65a34a8b7..96b1397e9 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">Sadece standart odaklama modunu kullanın</string>
   <string name="preferences_disable_continuous_focus_title">Hayır sürekli odak</string>
   <string name="preferences_disable_exposure_title">Maruziyet</string>
+  <string name="preferences_front_light_auto">Otomatik</string>
+  <string name="preferences_front_light_off">Atıl</string>
+  <string name="preferences_front_light_on">Aktif</string>
   <string name="preferences_front_light_summary">Bazı telefonlarda düşük ışıkta taramayı iyileştirir, ancak parlamaya neden olabilir. Tüm telefonlarda sonuç vermez.</string>
   <string name="preferences_front_light_title">Ön ışığı kullan</string>
   <string name="preferences_general_title">Genel ayarlar</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index af749dd38..4b5c22b28 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">只使用标准对焦模式</string>
   <string name="preferences_disable_continuous_focus_title">没有持续关注</string>
   <string name="preferences_disable_exposure_title">无曝光</string>
+  <string name="preferences_front_light_auto">自动</string>
+  <string name="preferences_front_light_off">待用</string>
+  <string name="preferences_front_light_on">活跃</string>
   <string name="preferences_front_light_summary">前灯可用时，打开前灯</string>
   <string name="preferences_front_light_title">前灯</string>
   <string name="preferences_general_title">一般设置</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 0cec35396..96b26d57b 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -105,6 +105,9 @@
   <string name="preferences_disable_continuous_focus_summary">只使用標準對焦模式</string>
   <string name="preferences_disable_continuous_focus_title">無連續對焦</string>
   <string name="preferences_disable_exposure_title">無曝光</string>
+  <string name="preferences_front_light_auto">自動</string>
+  <string name="preferences_front_light_off">待用</string>
+  <string name="preferences_front_light_on">活躍</string>
   <string name="preferences_front_light_summary">改善在低光源的環境下掃描的成功率，但有可能造成過度曝光的現象</string>
   <string name="preferences_front_light_title">使用前光源</string>
   <string name="preferences_general_title">一般設定</string>
diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index bb192e78e..1feb6645d 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -32,4 +32,14 @@
     <item>TW</item>
     <item>US</item>
   </string-array>
+  <string-array name="preferences_front_light_values">
+    <item>ON</item>
+    <item>AUTO</item>
+    <item>OFF</item>
+  </string-array>
+  <string-array name="preferences_front_light_options">
+    <item>@string/preferences_front_light_on</item>
+    <item>@string/preferences_front_light_auto</item>
+    <item>@string/preferences_front_light_off</item>
+  </string-array>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index d934fbc94..ff14998e1 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -107,6 +107,9 @@
   <string name="preferences_disable_exposure_title">No exposure</string>
   <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
   <string name="preferences_front_light_title">Use front light</string>
+  <string name="preferences_front_light_auto">Automatic</string>
+  <string name="preferences_front_light_off">Off</string>
+  <string name="preferences_front_light_on">On</string>
   <string name="preferences_general_title">General settings</string>
   <string name="preferences_name">Settings</string>
   <string name="preferences_play_beep_title">Beep</string>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index ca708ee95..b6bc97317 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -60,9 +60,11 @@
         android:summary="@string/preferences_custom_product_search_summary"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/preferences_general_title">
-    <CheckBoxPreference
-        android:key="preferences_front_light"
-        android:defaultValue="false"
+    <ListPreference
+        android:entries="@array/preferences_front_light_options"
+        android:entryValues="@array/preferences_front_light_values"
+        android:key="preferences_front_light_mode"
+        android:defaultValue="OFF"
         android:title="@string/preferences_front_light_title"
         android:summary="@string/preferences_front_light_summary"/>
     <CheckBoxPreference
diff --git a/android/src/com/google/zxing/client/android/AmbientLightManager.java b/android/src/com/google/zxing/client/android/AmbientLightManager.java
index 2d193b3ad..ebebb627d 100644
--- a/android/src/com/google/zxing/client/android/AmbientLightManager.java
+++ b/android/src/com/google/zxing/client/android/AmbientLightManager.java
@@ -17,11 +17,14 @@
 package com.google.zxing.client.android;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.preference.PreferenceManager;
 import com.google.zxing.client.android.camera.CameraManager;
+import com.google.zxing.client.android.camera.FrontLightMode;
 
 /**
  * Detects ambient light and switches on the front light when very dark, and off again when sufficiently light.
@@ -43,11 +46,14 @@ final class AmbientLightManager implements SensorEventListener {
   }
 
   void start(CameraManager cameraManager) {
-    SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-    lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
-    if (lightSensor != null) {
-      sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL);
-      this.cameraManager = cameraManager;
+    SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    if (FrontLightMode.readPref(sharedPrefs) == FrontLightMode.AUTO) {
+      SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+      lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+      if (lightSensor != null) {
+        sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        this.cameraManager = cameraManager;
+      }
     }
   }
 
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index fe4f179c3..ea1795305 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -189,7 +189,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     }
 
     beepManager.updatePrefs();
-    // ambientLightManager.start(cameraManager);
+    ambientLightManager.start(cameraManager);
 
     inactivityTimer.onResume();
 
@@ -273,7 +273,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
       handler = null;
     }
     inactivityTimer.onPause();
-    // ambientLightManager.stop();
+    ambientLightManager.stop();
     cameraManager.closeDriver();
     if (!hasSurface) {
       SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view);
diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java
index e81512bf2..47eeac100 100755
--- a/android/src/com/google/zxing/client/android/PreferencesActivity.java
+++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -42,7 +42,7 @@ public final class PreferencesActivity extends PreferenceActivity
   public static final String KEY_PLAY_BEEP = "preferences_play_beep";
   public static final String KEY_VIBRATE = "preferences_vibrate";
   public static final String KEY_COPY_TO_CLIPBOARD = "preferences_copy_to_clipboard";
-  public static final String KEY_FRONT_LIGHT = "preferences_front_light";
+  public static final String KEY_FRONT_LIGHT_MODE = "preferences_front_light_mode";
   public static final String KEY_BULK_MODE = "preferences_bulk_mode";
   public static final String KEY_REMEMBER_DUPLICATES = "preferences_remember_duplicates";
   public static final String KEY_SUPPLEMENTAL = "preferences_supplemental";
diff --git a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
index 637254b37..03a16cdab 100644
--- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -130,26 +130,27 @@ final class CameraConfigurationManager {
     return screenResolution;
   }
 
-  boolean getTorchSetting() {
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-    return prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false);
+  boolean getTorchState(Camera camera) {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      if (parameters != null) {
+        String flashMode = camera.getParameters().getFlashMode();
+        return flashMode != null &&
+            (Camera.Parameters.FLASH_MODE_ON.equals(flashMode) ||
+             Camera.Parameters.FLASH_MODE_TORCH.equals(flashMode));
+      }
+    }
+    return false;
   }
 
   void setTorch(Camera camera, boolean newSetting) {
     Camera.Parameters parameters = camera.getParameters();
     doSetTorch(parameters, newSetting, false);
     camera.setParameters(parameters);
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-    boolean currentSetting = prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false);
-    if (currentSetting != newSetting) {
-      SharedPreferences.Editor editor = prefs.edit();
-      editor.putBoolean(PreferencesActivity.KEY_FRONT_LIGHT, newSetting);
-      editor.commit();
-    }
   }
 
   private void initializeTorch(Camera.Parameters parameters, SharedPreferences prefs, boolean safeMode) {
-    boolean currentSetting = prefs.getBoolean(PreferencesActivity.KEY_FRONT_LIGHT, false);
+    boolean currentSetting = FrontLightMode.readPref(prefs) == FrontLightMode.ON;
     doSetTorch(parameters, currentSetting, safeMode);
   }
 
diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
index 3e8068887..bff1d449a 100755
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -166,7 +166,7 @@ public final class CameraManager {
    * Convenience method for {@link com.google.zxing.client.android.CaptureActivity}
    */
   public synchronized void setTorch(boolean newSetting) {
-    if (newSetting != configManager.getTorchSetting()) {
+    if (newSetting != configManager.getTorchState(camera)) {
       if (camera != null) {
         if (autoFocusManager != null) {
           autoFocusManager.stop();
diff --git a/android/src/com/google/zxing/client/android/camera/FrontLightMode.java b/android/src/com/google/zxing/client/android/camera/FrontLightMode.java
new file mode 100644
index 000000000..6d8f3d777
--- /dev/null
+++ b/android/src/com/google/zxing/client/android/camera/FrontLightMode.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * 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.google.zxing.client.android.camera;
+
+import android.content.SharedPreferences;
+import com.google.zxing.client.android.PreferencesActivity;
+
+/**
+ * Enumerates settings of the prefernce controlling the front light.
+ */
+public enum FrontLightMode {
+
+  /** Always on. */
+  ON,
+  /** On only when ambient light is low. */
+  AUTO,
+  /** Always off. */
+  OFF;
+
+  private static FrontLightMode parse(String modeString) {
+    return modeString == null ? OFF : valueOf(modeString);
+  }
+
+  public static FrontLightMode readPref(SharedPreferences sharedPrefs) {
+    return parse(sharedPrefs.getString(PreferencesActivity.KEY_FRONT_LIGHT_MODE, null));
+  }
+
+}