[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
dswitkin at google.com
dswitkin at google.com
Wed Aug 4 01:31:26 UTC 2010
The following commit has been merged in the upstream branch:
commit 11cd8b9c0d6784408ed5fdda812485b54825ddbd
Author: dswitkin at google.com <dswitkin at google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon May 10 14:57:40 2010 +0000
New icon from Roman Nurik, and help system tweaks.
git-svn-id: http://zxing.googlecode.com/svn/trunk@1346 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/AUTHORS b/AUTHORS
index a3bdc3c..34401e7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Paul Hackenberger
Randy Shen (Acer)
Rasmus Schrøder Sørensen
Richard Hřivňák
+Roman Nurik (Google)
Ryan Alford
Sanford Squires
Sean Owen (Google)
diff --git a/android/assets/html/about1d.html b/android/assets/html/about1d.html
index 448025b..992f3ba 100644
--- a/android/assets/html/about1d.html
+++ b/android/assets/html/about1d.html
@@ -2,7 +2,6 @@
<title>About 1D barcodes</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>About 1D barcodes</center></h3>
<p>Traditional barcodes, such as those printed on product packaging, are also known as <em>one
dimensional barcodes</em>. There are several types commonly used, including UPC and EAN. Most look
similar to this:</p>
diff --git a/android/assets/html/about2d.html b/android/assets/html/about2d.html
index ab2343a..59133d5 100644
--- a/android/assets/html/about2d.html
+++ b/android/assets/html/about2d.html
@@ -2,7 +2,6 @@
<title>About 2D barcodes</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>About 2D barcodes</center></h3>
<p><b>Barcode Scanner</b> also understands how to read two dimensional barcodes, called <em>QR
Codes</em>. For example, the QR Code below contains a hyperlink to the ZXing Project home page:</p>
<center><p><img src="../images/big-qr.png"></p></center>
diff --git a/android/assets/html/index.html b/android/assets/html/index.html
index e00afd7..d301a07 100644
--- a/android/assets/html/index.html
+++ b/android/assets/html/index.html
@@ -2,13 +2,12 @@
<title>Barcode Scanner Help</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>Welcome to Barcode Scanner</center></h3>
<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>
<center><p><img src="../images/scan-example.png"></p></center>
<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>
-<ul>
+<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>
<li><a href="about1d.html">About 1D barcodes</a></li>
@@ -16,4 +15,4 @@
<li><a href="sharing.html">How to use QR Codes to share information</a></li>
</ul>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/android/assets/html/scanning.html b/android/assets/html/scanning.html
index 8c86a17..db51779 100644
--- a/android/assets/html/scanning.html
+++ b/android/assets/html/scanning.html
@@ -2,7 +2,6 @@
<title>How to scan</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>How to scan</center></h3>
<p>Barcode Scanner continuously scans a square region shown on your screen — just line up the
phone so the barcode is completely inside the viewfinder rectangle:</p>
<center><p>
diff --git a/android/assets/html/sharing.html b/android/assets/html/sharing.html
index 81bc112..e90bb96 100644
--- a/android/assets/html/sharing.html
+++ b/android/assets/html/sharing.html
@@ -2,7 +2,6 @@
<title>How to share</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>How to share</center></h3>
<p>In addition to <a href="about2d.html">scanning 2D barcodes</a>, <b>Barcode Scanner</b> can also
generate a QR Code and display it on your screen. Then you can show it to a friend, and let them
scan the barcode with their phone:</p>
diff --git a/android/assets/html/style.css b/android/assets/html/style.css
index 74a5ecd..6b65f70 100644
--- a/android/assets/html/style.css
+++ b/android/assets/html/style.css
@@ -4,3 +4,7 @@ body {
font-family: arial;
font-size: 16;
}
+ul.touchable li {
+ padding-top:8px;
+ padding-bottom:8px;
+}
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 2126979..eb1f1e2 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -2,15 +2,15 @@
<title>What's new in this version</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>What's new in this version</center></h3>
<p>New in version 3.3:</p>
<ul>
<li>Added support for RSS-14 barcodes.</li>
- <li>Turned off the flash on the Behold II.</li>
+ <li>Diabled the flash on the Behold II.</li>
<li>Added the ability to send a QR Code generated with the Share feature.</li>
<li>Forced the beep sound off if the phone is in silent mode.</li>
<li>Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.</li>
<li>Added Portuguese and Danish translations.</li>
+ <li>New Eclair-style icon.</li>
</ul>
</body>
</html>
diff --git a/android/res/drawable-hdpi/launcher_icon.png b/android/res/drawable-hdpi/launcher_icon.png
index 43b1659..5932aad 100644
Binary files a/android/res/drawable-hdpi/launcher_icon.png and b/android/res/drawable-hdpi/launcher_icon.png differ
diff --git a/android/res/drawable/launcher_icon.png b/android/res/drawable/launcher_icon.png
index 0f815ab..fc5fafc 100755
Binary files a/android/res/drawable/launcher_icon.png and b/android/res/drawable/launcher_icon.png differ
diff --git a/android/res/layout/help.xml b/android/res/layout/help.xml
index d8613a5..74f05bb 100644
--- a/android/res/layout/help.xml
+++ b/android/res/layout/help.xml
@@ -33,20 +33,20 @@
android:layout_weight="0"
android:orientation="horizontal"
android:gravity="center"
- android:padding="6dip"
+ android:padding="4dip"
android:weightSum="1"
android:background="@color/help_button_view">
<Button android:id="@+id/back_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_weight="0.35"
+ android:layout_weight="0.5"
android:text="@string/button_back"/>
<Button android:id="@+id/done_button"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_weight="0.35"
+ android:layout_weight="0.5"
android:text="@string/button_done"/>
</LinearLayout>
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list