projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor changes from code inspection results
[zxing.git]
/
android
/
src
/
com
/
google
/
zxing
/
client
/
android
/
camera
/
CameraConfigurationManager.java
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
d0257ca
..
071388f
100644
(file)
--- a/
android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
+++ b/
android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@
-16,8
+16,6
@@
package com.google.zxing.client.android.camera;
package com.google.zxing.client.android.camera;
-import java.util.regex.Pattern;
-
import android.content.Context;
import android.graphics.Point;
import android.hardware.Camera;
import android.content.Context;
import android.graphics.Point;
import android.hardware.Camera;
@@
-26,6
+24,8
@@
import android.util.Log;
import android.view.Display;
import android.view.WindowManager;
import android.view.Display;
import android.view.WindowManager;
+import java.util.regex.Pattern;
+
final class CameraConfigurationManager {
private static final String TAG = CameraConfigurationManager.class.getSimpleName();
final class CameraConfigurationManager {
private static final String TAG = CameraConfigurationManager.class.getSimpleName();
@@
-118,7
+118,7
@@
final class CameraConfigurationManager {
return cameraResolution;
}
return cameraResolution;
}
- private static Point findBestPreviewSizeValue(
String
previewSizeValueString, Point screenResolution) {
+ private static Point findBestPreviewSizeValue(
CharSequence
previewSizeValueString, Point screenResolution) {
int bestX = 0;
int bestY = 0;
int diff = Integer.MAX_VALUE;
int bestX = 0;
int bestY = 0;
int diff = Integer.MAX_VALUE;
@@
-181,7
+181,9
@@
final class CameraConfigurationManager {
private void setFlash(Camera.Parameters parameters) {
// FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
// And this is a hack-hack to work around a different value on the Behold II
private void setFlash(Camera.Parameters parameters) {
// FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
// And this is a hack-hack to work around a different value on the Behold II
- if (Build.MODEL.contains("Behold II")) {
+ // Restrict Behold II check to Cupcake, per Samsung's advice
+ if (Build.MODEL.contains("Behold II") &&
+ CameraManager.SDK_INT == Build.VERSION_CODES.CUPCAKE) {
parameters.set("flash-value", 1);
} else {
parameters.set("flash-value", 2);
parameters.set("flash-value", 1);
} else {
parameters.set("flash-value", 2);