[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 3b22568664b0c0017ea793fd3cf5fde433e95717

[srowen]

The following commit has been merged in the upstream branch:
commit ab7205b1675d56027e56deacc5d2fb92a3e9fd4c
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue Mar 30 18:33:11 2010 +0000

    Ditch ugly "unknown" icon for standard project icon; tighten up barcode image view settings a little, I believe, by putting them in capture.xml and in dip units
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1265 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/res/drawable/unknown_barcode.png b/android/res/drawable/unknown_barcode.png
deleted file mode 100644
index b05df59..0000000
Binary files a/android/res/drawable/unknown_barcode.png and /dev/null differ
diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
index af16571..84ee1ef 100755
--- a/android/res/layout-ldpi/capture.xml
+++ b/android/res/layout-ldpi/capture.xml
@@ -54,6 +54,8 @@
         <ImageView android:id="@+id/barcode_image_view"
                    android:layout_width="160dip"
                    android:layout_height="wrap_content"
+                   android:maxWidth="160dip"
+                   android:maxHeight="160dip"
                    android:layout_marginBottom="4dip"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside"/>
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 42e8a13..b4e00bb 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -52,8 +52,10 @@
           android:gravity="left|top">
 
         <ImageView android:id="@+id/barcode_image_view"
-                   android:layout_width="wrap_content"
+                   android:layout_width="160dip"
                    android:layout_height="wrap_content"
+                   android:maxWidth="160dip"
+                   android:maxHeight="160dip"
                    android:layout_marginBottom="4dip"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside"/>
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index 91b7ad0..af49e41 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -38,7 +38,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
@@ -88,7 +87,6 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private static final int HELP_ID = Menu.FIRST + 3;
   private static final int ABOUT_ID = Menu.FIRST + 4;
 
-  private static final int MAX_RESULT_IMAGE_SIZE = 150;
   private static final long INTENT_RESULT_DURATION = 1500L;
   private static final float BEEP_VOLUME = 0.10f;
   private static final long VIBRATE_DURATION = 200L;
@@ -460,14 +458,13 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     viewfinderView.setVisibility(View.GONE);
     resultView.setVisibility(View.VISIBLE);
 
+    ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
     if (barcode == null) {
-      barcode = ((BitmapDrawable) getResources().getDrawable(R.drawable.unknown_barcode)).getBitmap();
+      barcodeImageView.setImageResource(R.drawable.zxing_icon);
+    } else {
+      barcodeImageView.setImageBitmap(barcode);
     }
-    ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
     barcodeImageView.setVisibility(View.VISIBLE);
-    barcodeImageView.setMaxWidth(MAX_RESULT_IMAGE_SIZE);
-    barcodeImageView.setMaxHeight(MAX_RESULT_IMAGE_SIZE);
-    barcodeImageView.setImageBitmap(barcode);
 
     TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
     formatTextView.setVisibility(View.VISIBLE);

-- 
Multi-format 1D/2D barcode image processing library