From 5b6ffefe851e3834a261efe473c72fb0d85f9e36 Mon Sep 17 00:00:00 2001 From: "dswitkin@google.com" Date: Wed, 15 Sep 2010 16:40:49 +0000 Subject: [PATCH] Bumped Barcode Scanner version to 3.5 beta 2, and updated some help text. git-svn-id: http://zxing.googlecode.com/svn/trunk@1590 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/AndroidManifest.xml | 4 ++-- android/assets/html/index.html | 5 +++-- android/assets/html/scanning.html | 2 +- android/assets/html/whatsnew.html | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 81606d4d..74388e3e 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. --> Barcode Scanner uses the camera on your phone to read barcodes and look up product information such as prices and reviews.

Scan example

-

It also reads 2D barcodes, called QR Codes, which can contain links to - web sites, contact information such as phone numbers and email addresses, map locations and more.

+

It also reads 2D barcodes such as QR Codes and DataMatrix. + These can contain links to web sites, contact information such as phone numbers and email + addresses, and more.

  • What's new in this version
  • How to scan
  • diff --git a/android/assets/html/scanning.html b/android/assets/html/scanning.html index 1f6a5498..407ebc83 100644 --- a/android/assets/html/scanning.html +++ b/android/assets/html/scanning.html @@ -10,7 +10,7 @@ Yes   No

    IMPORTANT: 1D barcodes like those found on products require a phone with autofocus. - Without it, only QR Codes will be scannable.

    + Without it, only QR Codes and DataMatrix codes will be scannable.

    When a barcode is read, a beep sound will play and you'll see the results of the scan, a description of what the barcode contains, and options to take action on the contents.

    If you're having trouble scanning, make sure to hold the phone steady. If the camera is unable to diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index d318e4dc..683b0f35 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -1,6 +1,6 @@ -What's new in this version +What's new in Barcode Scanner -- 2.20.1