From 8cc93b521b317ba98b8fd21e5984eb28dfe01503 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 10 May 2012 10:40:55 +0000
Subject: [PATCH] Back-port rewritten auto-focus cycle; allow disabling of auto
 focus

git-svn-id: https://zxing.googlecode.com/svn/trunk@2285 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             |  9 +-
 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             |  3 +-
 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/ids.xml                    |  2 -
 android/res/values/strings.xml                |  1 +
 android/res/xml/preferences.xml               |  4 +
 .../android/CaptureActivityHandler.java       |  9 --
 .../client/android/PreferencesActivity.java   |  1 +
 .../android/camera/AutoFocusCallback.java     | 52 -----------
 .../android/camera/AutoFocusManager.java      | 91 +++++++++++++++++++
 .../camera/CameraConfigurationManager.java    | 14 ++-
 .../client/android/camera/CameraManager.java  | 30 ++----
 38 files changed, 178 insertions(+), 119 deletions(-)
 delete mode 100644 android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
 create mode 100644 android/src/com/google/zxing/client/android/camera/AutoFocusManager.java

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index fe5ff8838..a610fc727 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">هل أنت متأكد؟</string>
   <string name="msg_unmount_usb">رجاء إيقاف التخزين على USB للمتابعة.</string>
   <string name="preferences_actions_title">عند العثور على رمز شريطي</string>
+  <string name="preferences_auto_focus_title">استخدام التركيز التلقائي</string>
   <string name="preferences_bulk_mode_summary">المسح الضوئي وحفظها بشكل مستمر العديد من الرموز الشريطية</string>
   <string name="preferences_bulk_mode_title">جل وضع المسح الضوئي</string>
   <string name="preferences_copy_to_clipboard_title">نسخ إلى الحافظة</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 2ea5918e6..ef526e056 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Сигурни ли сте?</string>
   <string name="msg_unmount_usb">Съжаляваме, но SD картата не е достъпна.</string>
   <string name="preferences_actions_title">При прочитане на баркод\u2026</string>
+  <string name="preferences_auto_focus_title">Използване на автоматично фокусиране</string>
   <string name="preferences_bulk_mode_summary">Сканирай и запомняй множество баркодове без прекъсване</string>
   <string name="preferences_bulk_mode_title">Масово сканиране</string>
   <string name="preferences_copy_to_clipboard_title">Копиране в клипборда</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index b6432ede9..34ed10751 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">N\'esteu segur?</string>
   <string name="msg_unmount_usb">La targeta SD no es troba disponible.</string>
   <string name="preferences_actions_title">En trobar un codi de barres\u2026</string>
+  <string name="preferences_auto_focus_title">Utilitzeu l\'enfocament automàtic</string>
   <string name="preferences_bulk_mode_summary">Escaneja i desa molts codis de barres de forma contínua</string>
   <string name="preferences_bulk_mode_title">Mode d\'escaneig en bloc</string>
   <string name="preferences_copy_to_clipboard_title">Copia al porta-retalls</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 5b15ccc33..d2c6d45b1 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Jste si jisti?</string>
   <string name="msg_unmount_usb">Omlouváme se, karta SD není přístupná.</string>
   <string name="preferences_actions_title">Byl nalezen čárový kód.\u2026</string>
+  <string name="preferences_auto_focus_title">Automatické zaostření</string>
   <string name="preferences_bulk_mode_summary">Skenování více čárových kódú bez přerušení, vhodné na dávkové zpracování velkého množství čárových kódú</string>
   <string name="preferences_bulk_mode_title">Dávkový režim skenování</string>
   <string name="preferences_copy_to_clipboard_title">Kopírovat do schránky.</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 3c3264c6c..fb36f34e7 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Er du sikker?</string>
   <string name="msg_unmount_usb">Beklager, SD-kortet er ikke tilgængelig.</string>
   <string name="preferences_actions_title">Når en stregkode er fundet\u2026</string>
+  <string name="preferences_auto_focus_title">Brug autofokus</string>
   <string name="preferences_bulk_mode_summary">Scan og gem mange stregkoder uden afbrydelser</string>
   <string name="preferences_bulk_mode_title">Massescanningstilstand</string>
   <string name="preferences_copy_to_clipboard_title">Kopiér til udklipsholder</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 0b2cb0c7d..c7debf54a 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Sind Sie sicher?</string>
   <string name="msg_unmount_usb">Leider kann nicht auf die SD-Karte zugegriffen werden.</string>
   <string name="preferences_actions_title">Wenn ein Barcode erkannt wurde\u2026</string>
+  <string name="preferences_auto_focus_title">Verwenden Sie Autofokus</string>
   <string name="preferences_bulk_mode_summary">Scannt und speichert mehrere Barcodes nacheinander</string>
   <string name="preferences_bulk_mode_title">Bulk-Scan-Modus</string>
   <string name="preferences_copy_to_clipboard_title">In Zwischenablage kopieren</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 7af9f1e4b..124f8f221 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Είσαι σίγουρος;</string>
   <string name="msg_unmount_usb">Συγνώμη, η κάρτα SD δεν είναι προσβάσιμη.</string>
   <string name="preferences_actions_title">Όταν ένα barcode ανιχνεύεται\u2026</string>
+  <string name="preferences_auto_focus_title">Χρησιμοποιήστε αυτόματη εστίαση</string>
   <string name="preferences_bulk_mode_summary">Σκανάρετε και αποθηκεύστε πολλά barcodes συνεχώς</string>
   <string name="preferences_bulk_mode_title">Λειτουργία μαζικού σκαναρίσματος</string>
   <string name="preferences_copy_to_clipboard_title">Αντιγραφή στο πρόχειρο</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 5615197cf..561cee88a 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">¿Está seguro?</string>
   <string name="msg_unmount_usb">Lo sentimos, la tarjeta SD no está accesible.</string>
   <string name="preferences_actions_title">Cuando encuentra un código de barras\u2026</string>
+  <string name="preferences_auto_focus_title">Utilizar el enfoque automático</string>
   <string name="preferences_bulk_mode_summary">Escanear y guardar muchos códigos de barras de forma continua</string>
   <string name="preferences_bulk_mode_title">Modo masivo de escaneo</string>
   <string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 0ab155e34..847e37de1 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -51,8 +51,8 @@
   <string name="contents_phone">Telefono zenbakia</string>
   <string name="contents_sms">SMS helbidea</string>
   <string name="contents_text">Testu laua</string>
-  <string name="history_clear_text">Garbitu historia</string>
   <string name="history_clear_one_history_text">Garbitu</string>
+  <string name="history_clear_text">Garbitu historia</string>
   <string name="history_email_title">Barra-kode Eskanerraren historia</string>
   <string name="history_empty">Hutsik</string>
   <string name="history_empty_detail">Ez da inoiz barra-koderik gorde</string>
@@ -94,6 +94,7 @@
   <string name="msg_sure">Ziur zaude?</string>
   <string name="msg_unmount_usb">Barkatu, SD txartela ez dago eskuragarri.</string>
   <string name="preferences_actions_title">Barra kode bat aurkitzean\u2026</string>
+  <string name="preferences_auto_focus_title">Erabili auto foku</string>
   <string name="preferences_bulk_mode_summary">Eskaneatu eta gorde hainbat barra-kode jarraian</string>
   <string name="preferences_bulk_mode_title">Handizkako eskaneatze modua</string>
   <string name="preferences_copy_to_clipboard_title">Kopiatu arbelera</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 03a4d65b5..0215a425a 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -67,7 +67,8 @@
   <string name="menu_share">Jaa</string>
   <string name="msg_about">Perustuu avoimen koodin ZXing Barcode -kirjastoon</string>
   <string name="msg_bulk_mode_scanned">Toistotila: viivakoodi luettu ja tallennetttu</string>
-  <string name="msg_camera_framework_bug">Anteeksi, Android-kamera kohtasi virheen. Sinun täytyy ehkä käynnistää laite uudelleen.</string>  <string name="msg_default_format">Formaatti</string>
+  <string name="msg_camera_framework_bug">Formaatti</string>
+  <string name="msg_default_format">Muoto</string>
   <string name="msg_default_meta">Metadata</string>
   <string name="msg_default_mms_subject">Hei</string>
   <string name="msg_default_status">Aseta viivakoodi neliön sisälle.</string>
@@ -77,7 +78,8 @@
   <string name="msg_google_books">Google Books</string>
   <string name="msg_google_product">Google Product Search</string>
   <string name="msg_google_shopper_missing">Google Shopper ei ole asennettu</string>
-  <string name="msg_install_google_shopper">Google Shopper yhdistää viivakoodin lukemisen mm. hintoihin ja arvosteluihin avaamatta selainta. Haluatko kokeilla sitä?</string>  <string name="msg_intent_failed">Anteeksi, pyydettyä ohjelmaa ei voi käynnistää. Viivakoodin sisältö on voinut vahingoittua.</string>
+  <string name="msg_install_google_shopper">Anteeksi, pyydettyä ohjelmaa ei voi käynnistää. Viivakoodin sisältö on voinut vahingoittua.</string>
+  <string name="msg_intent_failed">Anteeksi, pyysi sovellusta ei voitu käynnistää. Viivakoodi sisältö voi olla virheellinen.</string>
   <string name="msg_redirect">Uudelleenohjaus</string>
   <string name="msg_sbc_book_not_searchable">Anteeksi, tämä kirja ei ole haettavissa.</string>
   <string name="msg_sbc_failed">Anteeksi, haussa tapahtui virhe.</string>
@@ -92,6 +94,7 @@
   <string name="msg_sure">Oletko varma?</string>
   <string name="msg_unmount_usb">SD-kortti ei ole käytettävissä.</string>
   <string name="preferences_actions_title">Kun viivakoodi löytyy\u2026</string>
+  <string name="preferences_auto_focus_title">Käytä automaattisen tarkennuksen</string>
   <string name="preferences_bulk_mode_summary">Skannaa ja tallenna viivakoodeja jatkuvasti</string>
   <string name="preferences_bulk_mode_title">Toistotila</string>
   <string name="preferences_copy_to_clipboard_title">Kopioi leikepöydälle</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 9a28fb313..abffeb668 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Êtes-vous sûr?</string>
   <string name="msg_unmount_usb">Désolé, la carte SD n\'est pas accessible.</string>
   <string name="preferences_actions_title">Quand un code-barres est trouvé\u2026</string>
+  <string name="preferences_auto_focus_title">Utiliser l\'autofocus</string>
   <string name="preferences_bulk_mode_summary">Scanner et enregistrer plusieurs codes-barres d\'affilée</string>
   <string name="preferences_bulk_mode_title">Mode de lecture en rafale</string>
   <string name="preferences_copy_to_clipboard_title">Copier dans le presse papier</string>
diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml
index 40f39f39b..57a48b81b 100755
--- a/android/res/values-he/strings.xml
+++ b/android/res/values-he/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">האם אתה בטוח?</string>
   <string name="msg_unmount_usb">סליחה, כרטיס הזכרון אינו נגיש.</string>
   <string name="preferences_actions_title">כאשר ברקוד נמצא\u2026</string>
+  <string name="preferences_auto_focus_title">להשתמש במיקוד האוטומטי</string>
   <string name="preferences_bulk_mode_summary">סורק ושומר ברקודים באופן רציף</string>
   <string name="preferences_bulk_mode_title">מצב סריקה מרובה</string>
   <string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml
index 8fc501cf6..a9cbe5b61 100644
--- a/android/res/values-hi/strings.xml
+++ b/android/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">तुम्हें यकीन है?</string>
   <string name="msg_unmount_usb">क्षमा करें, एसडी कार्ड सुलभ नहीं है.</string>
   <string name="preferences_actions_title">जब एक बारकोड पाया जाता है\u2026</string>
+  <string name="preferences_auto_focus_title">ऑटो फोकस का उपयोग करें</string>
   <string name="preferences_bulk_mode_summary">स्कैन और कई बारकोड लगातार बचाने के</string>
   <string name="preferences_bulk_mode_title">थोक स्कैन मोड</string>
   <string name="preferences_copy_to_clipboard_title">क्लिपबोर्ड पर कॉपी</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index ab7890609..c4aa4e755 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Biztos benne?</string>
   <string name="msg_unmount_usb">Az SD kártya nem elérhető.</string>
   <string name="preferences_actions_title">Amikor a vonalkód megvan\u2026</string>
+  <string name="preferences_auto_focus_title">Használja autofókusz</string>
   <string name="preferences_bulk_mode_summary">Több vonalkód folyamatos szkennelése és mentése</string>
   <string name="preferences_bulk_mode_title">Tömeges beolvasás</string>
   <string name="preferences_copy_to_clipboard_title">Másolás a vágólapra</string>
diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml
index d4b6d37aa..995d5aaf2 100644
--- a/android/res/values-id/strings.xml
+++ b/android/res/values-id/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Apakah Anda yakin?</string>
   <string name="msg_unmount_usb">Maaf, SD card tidak dapat diakses.</string>
   <string name="preferences_actions_title">Ketika barcode sudah ditemukan\u2026</string>
+  <string name="preferences_auto_focus_title">Menggunakan fokus otomatis</string>
   <string name="preferences_bulk_mode_summary">Pindai dan simpan beberapa barcode terus-menerus</string>
   <string name="preferences_bulk_mode_title">Mode pemindaian bulk</string>
   <string name="preferences_copy_to_clipboard_title">Salin ke clipboard</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 69848c7e2..ae07d80d4 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Sei sicuro?</string>
   <string name="msg_unmount_usb">Spiacenti, la scheda SD non è accessibile.</string>
   <string name="preferences_actions_title">Quando viene trovato un codice a barre\u2026</string>
+  <string name="preferences_auto_focus_title">Utilizzare messa a fuoco automatica</string>
   <string name="preferences_bulk_mode_summary">Scansiona e salva diversi codici a barre in sequenza</string>
   <string name="preferences_bulk_mode_title">Modalità scansione di gruppo</string>
   <string name="preferences_copy_to_clipboard_title">Copia negli appunti</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 40f39f39b..57a48b81b 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">האם אתה בטוח?</string>
   <string name="msg_unmount_usb">סליחה, כרטיס הזכרון אינו נגיש.</string>
   <string name="preferences_actions_title">כאשר ברקוד נמצא\u2026</string>
+  <string name="preferences_auto_focus_title">להשתמש במיקוד האוטומטי</string>
   <string name="preferences_bulk_mode_summary">סורק ושומר ברקודים באופן רציף</string>
   <string name="preferences_bulk_mode_title">מצב סריקה מרובה</string>
   <string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index a13849af9..d780e1afe 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">よろしいですか？</string>
   <string name="msg_unmount_usb">申し訳ありませんが、SDカードにアクセスできません。</string>
   <string name="preferences_actions_title">バーコード発見時</string>
+  <string name="preferences_auto_focus_title">オートフォーカスを使用して、</string>
   <string name="preferences_bulk_mode_summary">多くのバーコード連続してスキャンし、保存する</string>
   <string name="preferences_bulk_mode_title">連続モードでのスキャン</string>
   <string name="preferences_copy_to_clipboard_title">クリップボードにコピーする</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index 2d34c17a5..0327e2351 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">계속하시겠습니까?</string>
   <string name="msg_unmount_usb">죄송합니다. SD카드를 사용할 수 없습니다.</string>
   <string name="preferences_actions_title">바코드를 스캔했을때\u2026</string>
+  <string name="preferences_auto_focus_title">자동 초점을 사용하여</string>
   <string name="preferences_bulk_mode_summary">다수의 바코드를 스캔하고 저장합니다.</string>
   <string name="preferences_bulk_mode_title">일괄 스캔 모드</string>
   <string name="preferences_copy_to_clipboard_title">복사하기</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 725bf2c67..d5273a2d6 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Weet je het zeker?</string>
   <string name="msg_unmount_usb">Sorry, de SD-kaart is niet toegankelijk.</string>
   <string name="preferences_actions_title">Als een barcode is gevonden\u2026</string>
+  <string name="preferences_auto_focus_title">Gebruik autofocus</string>
   <string name="preferences_bulk_mode_summary">Scan continue barcodes en sla ze allemaal op</string>
   <string name="preferences_bulk_mode_title">Bulk scan modus</string>
   <string name="preferences_copy_to_clipboard_title">Kopieer naar plakbord</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index f14eaaa3d..784c71e25 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Czy na pewno?</string>
   <string name="msg_unmount_usb">Niestety, karta SD nie jest dostępny.</string>
   <string name="preferences_actions_title">Kiedy kod paskowy zostaje odnaleziony\u2026</string>
+  <string name="preferences_auto_focus_title">Ustawić ostrość</string>
   <string name="preferences_bulk_mode_summary">Skanowanie i zapisywanie wielu kodów kreskowych ciągle</string>
   <string name="preferences_bulk_mode_title">Luzem tryb skanowania</string>
   <string name="preferences_copy_to_clipboard_title">Kopiuj do schowka</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 054e56d28..c693e6944 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Tem a certeza?</string>
   <string name="msg_unmount_usb">Desculpe, o cartão SD não está disponível.</string>
   <string name="preferences_actions_title">Quando o código de barras é encontrado\u2026</string>
+  <string name="preferences_auto_focus_title">Usar foco automático</string>
   <string name="preferences_bulk_mode_summary">Ler e guardar códigos de barras continuamente</string>
   <string name="preferences_bulk_mode_title">Modo em massa</string>
   <string name="preferences_copy_to_clipboard_title">Copiar para a área de transferência</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 81888426b..0ed1e0f1e 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Вы уверены?</string>
   <string name="msg_unmount_usb">К сожалению, SD-карта не доступна.</string>
   <string name="preferences_actions_title">Когда штрих-код найден\u2026</string>
+  <string name="preferences_auto_focus_title">Используйте автофокусом</string>
   <string name="preferences_bulk_mode_summary">Постоянно сканировать и сохранять штрих-коды</string>
   <string name="preferences_bulk_mode_title">Массовое сканирование</string>
   <string name="preferences_copy_to_clipboard_title">Копировать в буфер обмена</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 0fd8cd202..ae2081212 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Ste si istí?</string>
   <string name="msg_unmount_usb">Ospravedlňujeme sa, karta SD nie je prístupná.</string>
   <string name="preferences_actions_title">Pri zistení čiarového kódu</string>
+  <string name="preferences_auto_focus_title">Automatické zaostrenie</string>
   <string name="preferences_bulk_mode_summary">Skenovať a ukladať veľa čiarových kódov bez prerušenia</string>
   <string name="preferences_bulk_mode_title">Hromadný režim skenovania</string>
   <string name="preferences_copy_to_clipboard_title">Kopírovať do schránky</string>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index 24b0ca82d..518eec565 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Ali ste prepričani?</string>
   <string name="msg_unmount_usb">Oprostite, do SD kartice ni možno dostopati</string>
   <string name="preferences_actions_title">Ko je črtna koda najdena\u2026</string>
+  <string name="preferences_auto_focus_title">Uporabite samodejno ostrenje</string>
   <string name="preferences_bulk_mode_summary">Beri in shrani več črtnih kod zaporedoma</string>
   <string name="preferences_bulk_mode_title">Branje črtnih kod na debelo</string>
   <string name="preferences_copy_to_clipboard_title">Kopiraj v beležnico</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 3955425bc..5abbe2d01 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Är du säker?</string>
   <string name="msg_unmount_usb">Tyvärr är SD-kortet inte tillgänglig.</string>
   <string name="preferences_actions_title">När en streckkod hittats\u2026</string>
+  <string name="preferences_auto_focus_title">Använd autofokus</string>
   <string name="preferences_bulk_mode_summary">Skanna och spara många streckkoder kontinuerligt</string>
   <string name="preferences_bulk_mode_title">Bulk skanningsläget</string>
   <string name="preferences_copy_to_clipboard_title">Kopiera till klippbordet</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 355d24ade..d42f7b693 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">Emin misin?</string>
   <string name="msg_unmount_usb">Lütfen USB depolamayı devre dışı bırakın.</string>
   <string name="preferences_actions_title">Bir barkod bulunduğu zaman\u2026</string>
+  <string name="preferences_auto_focus_title">Otomatik odaklama kullanın</string>
   <string name="preferences_bulk_mode_summary">Birden fazla barkodu toplu olarak taramak ve kaydetmek için</string>
   <string name="preferences_bulk_mode_title">Toplu tarama modu</string>
   <string name="preferences_copy_to_clipboard_title">Panoya kopyala</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 640e2ba06..201073961 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">你肯定吗？</string>
   <string name="msg_unmount_usb">抱歉，SD卡不可访问。</string>
   <string name="preferences_actions_title">找到条码时</string>
+  <string name="preferences_auto_focus_title">使用自动对焦</string>
   <string name="preferences_bulk_mode_summary">连续扫描并保存多个条形码</string>
   <string name="preferences_bulk_mode_title">批量扫描模式</string>
   <string name="preferences_copy_to_clipboard_title">复制到剪切板</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 9fb24890a..dfad3d2c0 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2011 ZXing authors
+ 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.
@@ -94,6 +94,7 @@
   <string name="msg_sure">你確定嗎？</string>
   <string name="msg_unmount_usb">無法讀取 SD 卡。</string>
   <string name="preferences_actions_title">找到條碼時</string>
+  <string name="preferences_auto_focus_title">使用自動對焦</string>
   <string name="preferences_bulk_mode_summary">連續掃描並儲存多個條碼</string>
   <string name="preferences_bulk_mode_title">大量掃描模式</string>
   <string name="preferences_copy_to_clipboard_title">複製到剪貼簿</string>
diff --git a/android/res/values/ids.xml b/android/res/values/ids.xml
index feeec4c55..095ee5a57 100755
--- a/android/res/values/ids.xml
+++ b/android/res/values/ids.xml
@@ -15,8 +15,6 @@
  limitations under the License.
  -->
 <resources>
-  <!-- Messages IDs -->
-  <item type="id" name="auto_focus"/>
   <item type="id" name="decode"/>
   <item type="id" name="decode_failed"/>
   <item type="id" name="decode_succeeded"/>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f7b9ad63f..b35e092dd 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -94,6 +94,7 @@
   <string name="msg_sure">Are you sure?</string>
   <string name="msg_unmount_usb">Sorry, the SD card is not accessible.</string>
   <string name="preferences_actions_title">When a barcode is found\u2026</string>
+  <string name="preferences_auto_focus_title">Use auto focus</string>
   <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
   <string name="preferences_bulk_mode_title">Bulk scan mode</string>
   <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index 265744648..b4c34f21c 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -65,6 +65,10 @@
         android:defaultValue="false"
         android:title="@string/preferences_front_light_title"
         android:summary="@string/preferences_front_light_summary"/>
+    <CheckBoxPreference
+        android:key="preferences_auto_focus"
+        android:defaultValue="true"
+        android:title="@string/preferences_auto_focus_title"/>
     <CheckBoxPreference
         android:key="preferences_bulk_mode"
         android:defaultValue="false"
diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
index bc23df115..736896e6e 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -70,14 +70,6 @@ public final class CaptureActivityHandler extends Handler {
   @Override
   public void handleMessage(Message message) {
     switch (message.what) {
-      case R.id.auto_focus:
-        //Log.d(TAG, "Got auto-focus message");
-        // When one auto focus pass finishes, start another. This is the closest thing to
-        // continuous AF. It does seem to hunt a bit, but I'm not sure what else to do.
-        if (state == State.PREVIEW) {
-          cameraManager.requestAutoFocus(this, R.id.auto_focus);
-        }
-        break;
       case R.id.restart_preview:
         Log.d(TAG, "Got restart preview message");
         restartPreviewAndDecode();
@@ -131,7 +123,6 @@ public final class CaptureActivityHandler extends Handler {
     if (state == State.SUCCESS) {
       state = State.PREVIEW;
       cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
-      cameraManager.requestAutoFocus(this, R.id.auto_focus);
       activity.drawViewfinder();
     }
   }
diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java
index 8050a4ca4..5d9a3ba41 100755
--- a/android/src/com/google/zxing/client/android/PreferencesActivity.java
+++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -46,6 +46,7 @@ public final class PreferencesActivity extends PreferenceActivity
   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";
+  public static final String KEY_AUTO_FOCUS = "preferences_auto_focus";
   public static final String KEY_SEARCH_COUNTRY = "preferences_search_country";
 
   public static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown";
diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java b/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
deleted file mode 100644
index 482fb4461..000000000
--- a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2010 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.hardware.Camera;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-final class AutoFocusCallback implements Camera.AutoFocusCallback {
-
-  private static final String TAG = AutoFocusCallback.class.getSimpleName();
-
-  private static final long AUTOFOCUS_INTERVAL_MS = 1500L;
-
-  private Handler autoFocusHandler;
-  private int autoFocusMessage;
-
-  void setHandler(Handler autoFocusHandler, int autoFocusMessage) {
-    this.autoFocusHandler = autoFocusHandler;
-    this.autoFocusMessage = autoFocusMessage;
-  }
-
-  @Override
-  public void onAutoFocus(boolean success, Camera camera) {
-    if (autoFocusHandler != null) {
-      Message message = autoFocusHandler.obtainMessage(autoFocusMessage, success);
-      // Simulate continuous autofocus by sending a focus request every
-      // AUTOFOCUS_INTERVAL_MS milliseconds.
-      //Log.d(TAG, "Got auto-focus callback; requesting another");
-      autoFocusHandler.sendMessageDelayed(message, AUTOFOCUS_INTERVAL_MS);
-      autoFocusHandler = null;
-    } else {
-      Log.d(TAG, "Got auto-focus callback, but no handler for it");
-    }
-  }
-
-}
diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
new file mode 100644
index 000000000..797e4e48e
--- /dev/null
+++ b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
@@ -0,0 +1,91 @@
+/*
+ * 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.Context;
+import android.content.SharedPreferences;
+import android.hardware.Camera;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import com.google.zxing.client.android.PreferencesActivity;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+final class AutoFocusManager implements Camera.AutoFocusCallback {
+
+  private static final String TAG = AutoFocusManager.class.getSimpleName();
+
+  private static final long AUTO_FOCUS_INTERVAL_MS = 2000L;
+
+  private boolean active;
+  private final boolean useAutoFocus;
+  private final Camera camera;
+  private final Timer timer;
+  private TimerTask outstandingTask;
+
+  AutoFocusManager(Context context, Camera camera) {
+    this.camera = camera;
+    timer = new Timer(true);
+    SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    String currentFocusMode = camera.getParameters().getFocusMode();
+    useAutoFocus =
+        sharedPrefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true) &&
+        Camera.Parameters.FOCUS_MODE_AUTO.equals(currentFocusMode);
+    Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus);
+    start();
+  }
+
+  @Override
+  public synchronized void onAutoFocus(boolean success, Camera theCamera) {
+    if (active) {
+      outstandingTask = new TimerTask() {
+        @Override
+        public void run() {
+          if (active) {
+            start();
+          }
+        }
+      };
+      timer.schedule(outstandingTask, AUTO_FOCUS_INTERVAL_MS);
+    }
+  }
+
+  synchronized void start() {
+    if (useAutoFocus) {
+      active = true;
+      try {
+        camera.autoFocus(this);
+      } catch (RuntimeException re) {
+        // Have heard RuntimeException reported in Android 4.0.x+; continue?
+        Log.w(TAG, "Unexpected exception while focusing", re);
+      }
+    }
+  }
+
+  synchronized void stop() {
+    if (useAutoFocus) {
+      camera.cancelAutoFocus();
+    }
+    if (outstandingTask != null) {
+      outstandingTask.cancel();
+      outstandingTask = null;
+    }
+    active = false;
+  }
+
+}
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 6b7086425..bed514696 100644
--- a/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -89,9 +89,17 @@ final class CameraConfigurationManager {
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
     initializeTorch(parameters, prefs);
-    String focusMode = findSettableValue(parameters.getSupportedFocusModes(),
-                                         Camera.Parameters.FOCUS_MODE_AUTO,
-                                         Camera.Parameters.FOCUS_MODE_MACRO);
+    String focusMode = null;
+    if (prefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true)) {
+      focusMode = findSettableValue(parameters.getSupportedFocusModes(),
+                                    Camera.Parameters.FOCUS_MODE_AUTO);
+    }
+    // Maybe selected auto-focus but not available, so fall through here:
+    if (focusMode == null) {
+      focusMode = findSettableValue(parameters.getSupportedFocusModes(),
+                                    Camera.Parameters.FOCUS_MODE_MACRO,
+                                    "edof"); // Camera.Parameters.FOCUS_MODE_EDOF in 2.2+
+    }
     if (focusMode != null) {
       parameters.setFocusMode(focusMode);
     }
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 835978fa9..56d13a220 100755
--- a/android/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -43,8 +43,10 @@ public final class CameraManager {
   private static final int MAX_FRAME_WIDTH = 600;
   private static final int MAX_FRAME_HEIGHT = 400;
 
+  private final Context context;
   private final CameraConfigurationManager configManager;
   private Camera camera;
+  private AutoFocusManager autoFocusManager;
   private Rect framingRect;
   private Rect framingRectInPreview;
   private boolean initialized;
@@ -56,13 +58,11 @@ public final class CameraManager {
    * clear the handler so it will only receive one message.
    */
   private final PreviewCallback previewCallback;
-  /** Autofocus callbacks arrive here, and are dispatched to the Handler which requested them. */
-  private final AutoFocusCallback autoFocusCallback;
 
   public CameraManager(Context context) {
+    this.context = context;
     this.configManager = new CameraConfigurationManager(context);
     previewCallback = new PreviewCallback(configManager);
-    autoFocusCallback = new AutoFocusCallback();
   }
 
   /**
@@ -116,6 +116,7 @@ public final class CameraManager {
     if (theCamera != null && !previewing) {
       theCamera.startPreview();
       previewing = true;
+      autoFocusManager = new AutoFocusManager(context, camera);
     }
   }
 
@@ -123,10 +124,13 @@ public final class CameraManager {
    * Tells the camera to stop drawing preview frames.
    */
   public synchronized void stopPreview() {
+    if (autoFocusManager != null) {
+      autoFocusManager.stop();
+      autoFocusManager = null;
+    }
     if (camera != null && previewing) {
       camera.stopPreview();
       previewCallback.setHandler(null, 0);
-      autoFocusCallback.setHandler(null, 0);
       previewing = false;
     }
   }
@@ -147,24 +151,6 @@ public final class CameraManager {
     }
   }
 
-  /**
-   * Asks the camera hardware to perform an autofocus.
-   *
-   * @param handler The Handler to notify when the autofocus completes.
-   * @param message The message to deliver.
-   */
-  public synchronized void requestAutoFocus(Handler handler, int message) {
-    if (camera != null && previewing) {
-      autoFocusCallback.setHandler(handler, message);
-      try {
-        camera.autoFocus(autoFocusCallback);
-      } catch (RuntimeException re) {
-        // Have heard RuntimeException reported in Android 4.0.x+; continue?
-        Log.w(TAG, "Unexpected exception while focusing", re);
-      }
-    }
-  }
-
   /**
    * Calculates the framing rect which the UI should draw to show the user where to place the
    * barcode. This target helps with alignment as well as forces the user to hold the device