From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 1 Mar 2010 15:38:55 +0000 (+0000)
Subject: Per Daniel -- don't check phone's preview size as we want to use screen size if possible
X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=344f9892021713d9a32f77ac47bb9e9f5647b750

Per Daniel -- don't check phone's preview size as we want to use screen size if possible

git-svn-id: http://zxing.googlecode.com/svn/trunk@1231 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---

diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 9b64ef1c..ee0c0fa7 100755
--- a/android/src/com/google/zxing/client/android/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/CameraManager.java
@@ -354,24 +354,17 @@ final class CameraManager {
 
   private Point getCameraResolution(Camera.Parameters parameters) {
 
-    Point cameraResolution = null;
-
-    Camera.Size cameraPreviewSize = parameters.getPreviewSize();
-    if (cameraPreviewSize != null) {
-      Log.v(TAG, "Default preview size: " + cameraPreviewSize.width + ", " + cameraPreviewSize.height);
-      cameraResolution = new Point(cameraPreviewSize.width, cameraPreviewSize.height);
+    String previewSizeValueString = parameters.get("preview-size-values");
+    // saw this on Xperia
+    if (previewSizeValueString == null) {
+      previewSizeValueString = parameters.get("preview-size-value");
     }
 
-    if (cameraResolution == null) {
-      String previewSizeValueString = parameters.get("preview-size-values");
-      // saw this on Xperia
-      if (previewSizeValueString == null) {
-        previewSizeValueString = parameters.get("preview-size-value");
-      }
-      if (previewSizeValueString != null) {
-        Log.v(TAG, "preview-size parameter: " + previewSizeValueString);
-        cameraResolution = findBestPreviewSizeValue(previewSizeValueString, screenResolution);
-      }
+    Point cameraResolution = null;
+    
+    if (previewSizeValueString != null) {
+      Log.v(TAG, "preview-size parameter: " + previewSizeValueString);
+      cameraResolution = findBestPreviewSizeValue(previewSizeValueString, screenResolution);
     }
 
     if (cameraResolution == null) {