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

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 81606d4..74388e3 100755 (executable)
--- 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"
 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.5 beta 1"
-          android:versionCode="60"
+          android:versionName="3.5 beta 2"
+          android:versionCode="61"

           android:installLocation="auto">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
           android:installLocation="auto">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"

diff --git a/android/assets/html/index.html b/android/assets/html/index.html
index 71aa3a8..8ffd0bb 100644 (file)
--- a/android/assets/html/index.html
+++ b/android/assets/html/index.html
@@ -7,8 +7,9 @@
 <p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up product
   information such as prices and reviews.</p>
 <p style="text-align:center"><img src="../images/scan-example.png" alt="Scan example"></p>
 <p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up product
   information such as prices and reviews.</p>
 <p style="text-align:center"><img src="../images/scan-example.png" alt="Scan example"></p>

-<p>It also reads <strong>2D barcodes</strong>, called <em>QR Codes</em>, which can contain links to
-  web sites, contact information such as phone numbers and email addresses, map locations and more.</p>
+<p>It also reads <strong>2D barcodes</strong> such as <em>QR Codes</em> and <em>DataMatrix</em>.
+  These can contain links to web sites, contact information such as phone numbers and email
+  addresses, and more.</p>

 <ul class="touchable">
   <li><a href="whatsnew.html">What's new in this version</a></li>
   <li><a href="scanning.html">How to scan</a></li>
 <ul class="touchable">
   <li><a href="whatsnew.html">What's new in this version</a></li>
   <li><a href="scanning.html">How to scan</a></li>

diff --git a/android/assets/html/scanning.html b/android/assets/html/scanning.html
index 1f6a549..407ebc8 100644 (file)
--- a/android/assets/html/scanning.html
+++ b/android/assets/html/scanning.html
@@ -10,7 +10,7 @@
   <img src="../images/demo-yes.png" alt="Yes"/>&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png" alt="No"/>
 </p>
 <p><b>IMPORTANT:</b> 1D barcodes like those found on products require a phone with autofocus.
   <img src="../images/demo-yes.png" alt="Yes"/>&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png" alt="No"/>
 </p>
 <p><b>IMPORTANT:</b> 1D barcodes like those found on products require a phone with autofocus.

-  Without it, only QR Codes will be scannable.</p>
+  Without it, only QR Codes and DataMatrix codes will be scannable.</p>

 <p>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.</p>
 <p>If you're having trouble scanning, make sure to hold the phone steady. If the camera is unable to
 <p>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.</p>
 <p>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 d318e4d..683b0f3 100644 (file)
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -1,6 +1,6 @@
 <html>
 <head>
 <html>
 <head>

-<title>What's new in this version</title>
+<title>What's new in Barcode Scanner</title>

 <link rel="stylesheet" href="style.css" type="text/css"/>
 </head>
 <body>
 <link rel="stylesheet" href="style.css" type="text/css"/>
 </head>
 <body>