mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 1261 autoFocus() on macro mode too

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2291 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-05-12 19:42:40 +00:00
parent 785197a625
commit 704f6c34fb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
View file

@ -23,6 +23,8 @@ import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.PreferencesActivity;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@ -31,6 +33,12 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
private static final String TAG = AutoFocusManager.class.getSimpleName(); private static final String TAG = AutoFocusManager.class.getSimpleName();
private static final long AUTO_FOCUS_INTERVAL_MS = 2000L; private static final long AUTO_FOCUS_INTERVAL_MS = 2000L;
private static final Collection<String> FOCUS_MODES_CALLING_AF;
static {
FOCUS_MODES_CALLING_AF = new ArrayList<String>(2);
FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_AUTO);
FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_MACRO);
}
private boolean active; private boolean active;
private final boolean useAutoFocus; private final boolean useAutoFocus;
@ -45,7 +53,7 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
String currentFocusMode = camera.getParameters().getFocusMode(); String currentFocusMode = camera.getParameters().getFocusMode();
useAutoFocus = useAutoFocus =
sharedPrefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true) && sharedPrefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true) &&
Camera.Parameters.FOCUS_MODE_AUTO.equals(currentFocusMode); FOCUS_MODES_CALLING_AF.contains(currentFocusMode);
Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus); Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus);
start(); start();
} }