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

Wed Aug 4 01:31:45 UTC 2010

The following commit has been merged in the upstream branch:
commit 3ca83472f1bf4b175be23ec75af8635c9963d3e7
Author: dswitkin <dswitkin at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Wed May 26 16:58:15 2010 +0000

    Created Barcode Scanner 3.31 beta 1.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1391 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1ad29ff..f84f083 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.3"
-          android:versionCode="51">
+          android:versionName="3.31 beta 1"
+          android:versionCode="52">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index eb1f1e2..0356d1c 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -2,7 +2,16 @@
 <title>What's new in this version</title>
 <body>
 <link rel="StyleSheet" href="style.css" type="text/css">
-<p>New in version 3.3:</p>
+<p><b>New in version 3.31:</b></p>
+<ul>
+  <li>Fixed a bug which caused some devices not to scan from time to time.</li>
+  <li>Added Arabic translation.</li>
+  <li>Improved scanning speed.</li>
+  <li>Added RSS Expanded support.</li>
+  <li>Fixed a crash in the QR Code reader.</li>
+  <li>Improved Chinese characeter support in QR Codes.</li>
+</ul>
+<p><b>New in version 3.3:</b></p>
 <ul>
   <li>Added support for RSS-14 barcodes.</li>
   <li>Diabled the flash on the Behold II.</li>
diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index 087df0a..0535ad4 100644
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -36,7 +36,6 @@ import android.widget.Button;
  * @author dswitkin at google.com (Daniel Switkin)
  */
 public final class HelpActivity extends Activity {
-
   private static final String TAG = HelpActivity.class.getSimpleName();
 
   // Actually guessing at the Desire's MODEL for now:
@@ -51,6 +50,7 @@ public final class HelpActivity extends Activity {
   public static final String WHATS_NEW_PAGE = "whatsnew.html";
   private static final String BASE_URL = "file:///android_asset/html/";
 
+  private static boolean initialized = false;
   private WebView webView;
   private Button backButton;
 
@@ -101,12 +101,11 @@ public final class HelpActivity extends Activity {
     backButton.setOnClickListener(backListener);
     Button doneButton = (Button)findViewById(R.id.done_button);
     doneButton.setOnClickListener(doneListener);
-  }
 
-  @Override
-  public void onResume() {
-    super.onResume();
-    checkBuggyDevice();
+    if (!initialized) {
+      initialized = true;
+      checkBuggyDevice();
+    }
   }
 
   private void checkBuggyDevice() {
@@ -119,7 +118,7 @@ public final class HelpActivity extends Activity {
           builder.setMessage(R.string.msg_buggy);
           builder.setPositiveButton(R.string.button_ok, groupsListener);
           builder.setNegativeButton(R.string.button_cancel, null);
-          builder.create().show();
+          builder.show();
           break;
         }
       }
@@ -149,5 +148,4 @@ public final class HelpActivity extends Activity {
       backButton.setEnabled(view.canGoBack());
     }
   }
-
 }

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

