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.view.Display;
import android.view.WindowManager;
+import java.util.regex.Pattern;
+
final class CameraConfigurationManager {
private static final String TAG = CameraConfigurationManager.class.getSimpleName();
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;
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);