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

Backing out this change for the Droid on suspicion that it's interfering with at least one other device

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1363 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-05-15 10:19:23 +00:00
parent 71eda605bc
commit 78100ee871
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,15 +27,9 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback {
private static final long AUTOFOCUS_INTERVAL_MS = 1500L; private static final long AUTOFOCUS_INTERVAL_MS = 1500L;
private final CameraConfigurationManager configManager;
private boolean reinitCamera;
private Handler autoFocusHandler; private Handler autoFocusHandler;
private int autoFocusMessage; private int autoFocusMessage;
AutoFocusCallback(CameraConfigurationManager configManager) {
this.configManager = configManager;
}
void setHandler(Handler autoFocusHandler, int autoFocusMessage) { void setHandler(Handler autoFocusHandler, int autoFocusMessage) {
this.autoFocusHandler = autoFocusHandler; this.autoFocusHandler = autoFocusHandler;
this.autoFocusMessage = autoFocusMessage; this.autoFocusMessage = autoFocusMessage;
@ -49,10 +43,6 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback {
//Log.d(TAG, "Got auto-focus callback; requesting another"); //Log.d(TAG, "Got auto-focus callback; requesting another");
autoFocusHandler.sendMessageDelayed(message, AUTOFOCUS_INTERVAL_MS); autoFocusHandler.sendMessageDelayed(message, AUTOFOCUS_INTERVAL_MS);
autoFocusHandler = null; autoFocusHandler = null;
if (!reinitCamera) {
reinitCamera = true;
configManager.setDesiredCameraParameters(camera);
}
} else { } else {
Log.d(TAG, "Got auto-focus callback, but no handler for it"); Log.d(TAG, "Got auto-focus callback, but no handler for it");
} }

2
android/src/com/google/zxing/client/android/camera/CameraManager.java
View file

@ -98,7 +98,7 @@ public final class CameraManager {
useOneShotPreviewCallback = Integer.parseInt(Build.VERSION.SDK) > Build.VERSION_CODES.CUPCAKE; useOneShotPreviewCallback = Integer.parseInt(Build.VERSION.SDK) > Build.VERSION_CODES.CUPCAKE;
previewCallback = new PreviewCallback(configManager, useOneShotPreviewCallback); previewCallback = new PreviewCallback(configManager, useOneShotPreviewCallback);
autoFocusCallback = new AutoFocusCallback(configManager); autoFocusCallback = new AutoFocusCallback();
} }
/** /**