From: dswitkin Date: Wed, 26 May 2010 16:58:15 +0000 (+0000) Subject: Created Barcode Scanner 3.31 beta 1. X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=3ca83472f1bf4b175be23ec75af8635c9963d3e7;hp=59de7b7ab2c999c3173e6e125d4c87d5c0daaaaa;p=zxing.git 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 1ad29ff1..f84f0833 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. --> + android:versionName="3.31 beta 1" + android:versionCode="52"> diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index eb1f1e21..0356d1c7 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -2,7 +2,16 @@ What's new in this version -

New in version 3.3:

+

New in version 3.31:

+
    +
  • Fixed a bug which caused some devices not to scan from time to time.
    • +
  • Added Arabic translation.
    • +
  • Improved scanning speed.
    • +
  • Added RSS Expanded support.
    • +
  • Fixed a crash in the QR Code reader.
    • +
  • Improved Chinese characeter support in QR Codes.
    • +
+

New in version 3.3:

  • Added support for RSS-14 barcodes.
  • Diabled the flash on the Behold II.
    • diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java index 087df0a2..0535ad4a 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@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()); } } - }