mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bumped Barcode Scanner version to 3.5 beta 2, and updated some help text.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1590 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2010-09-15 16:40:49 +00:00
parent 655eeb3537
commit d6d026e3dd
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -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. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="3.5 beta 1" android:versionName="3.5 beta 2"
android:versionCode="60" android:versionCode="61"
android:installLocation="auto"> android:installLocation="auto">
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. --> <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
<uses-sdk android:minSdkVersion="3" <uses-sdk android:minSdkVersion="3"

5
android/assets/html/index.html
View file

@ -7,8 +7,9 @@
<p><b>Barcode Scanner</b> uses the camera on your phone to read barcodes and look up product <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> information such as prices and reviews.</p>
<p style="text-align:center"><img src="../images/scan-example.png" alt="Scan example"></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 <p>It also reads <strong>2D barcodes</strong> such as <em>QR Codes</em> and <em>DataMatrix</em>.
web sites, contact information such as phone numbers and email addresses, map locations and more.</p> These can contain links to web sites, contact information such as phone numbers and email
addresses, and more.</p>
<ul class="touchable"> <ul class="touchable">
<li><a href="whatsnew.html">What's new in this version</a></li> <li><a href="whatsnew.html">What's new in this version</a></li>
<li><a href="scanning.html">How to scan</a></li> <li><a href="scanning.html">How to scan</a></li>

2
android/assets/html/scanning.html
View file

@ -10,7 +10,7 @@
<img src="../images/demo-yes.png" alt="Yes"/>&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png" alt="No"/> <img src="../images/demo-yes.png" alt="Yes"/>&nbsp;&nbsp;&nbsp;<img src="../images/demo-no.png" alt="No"/>
</p> </p>
<p><b>IMPORTANT:</b> 1D barcodes like those found on products require a phone with autofocus. <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 <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> 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>If you're having trouble scanning, make sure to hold the phone steady. If the camera is unable to

2
android/assets/html/whatsnew.html
View file

@ -1,6 +1,6 @@
<html> <html>
<head> <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"/> <link rel="stylesheet" href="style.css" type="text/css"/>
</head> </head>
<body> <body>