<html>
-<title>About 1D Barcodes</title>
+<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 are also known as one dimensional barcodes. There are several varieties,
- including UPC and EAN in common use. Most look similar to this:</p>
+<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>
<center><p><img src="../images/big-1d.png"></p></center>
<p>These 1D barcodes contain a unique code which typically describes a product, like a CD or a book.
You can look this code up on the internet to find prices, reviews, and more.</p>
<p>If you scan a book, you can also search the contents of the book for a word or phrase, and find
all the pages where it appears:</p>
-<center><p><img src="../images/search-book-contents.jpg"></p></center>
+<center><p><img src="../images/search-book-contents.png"></p></center>
</body>
</html>
\ No newline at end of file
<html>
-<title>About 2D Barcodes</title>
+<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 QR Codes. For
- example, the QR Code below contains a hyperlink to the ZXing Project home page:</p>
+<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>
<p>You can also represent contact information in a QR Code, and put it on a business card or web
site. When you scan it, the results screen provides a choice of actions:</p>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>Welcome to Barcode Scanner</center></h3>
-<p><b>Barcode Scanner</b> lets you use your Android camera phone to read barcodes, then look up
- product information such as prices and reviews.</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>
<center><p><img src="../images/scan-example.png"></p></center>
-<p>It can also read 2D barcodes called QR Codes, which can contain links to web sites, contact
- info like phone number and email, and more. Click below to learn more.</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>
<ul>
- <li><a href="whatsnew.html">What's New</a></li>
- <li><a href="scanning.html">How To Scan</a></li>
- <li><a href="about1d.html">About 1D Barcodes</a></li>
- <li><a href="about2d.html">About 2D Barcodes</a></li>
- <li><a href="sharing.html">How To Share Data With Friends</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="about1d.html">About 1D barcodes</a></li>
+ <li><a href="about2d.html">About 2D barcodes</a></li>
+ <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>
-<title>How To Scan</title>
+<title>How to scan</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>How To Scan</center></h3>
-<p>Scanning a barcode is fast and easy. <b>Barcode Scanner</b> continuously scans the viewfinder
- rectangle, so there's no need to press the shutter button. Just move the phone until the barcode
- is completely inside:</p>
+<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>
<img src="../images/demo-yes.png"> <img src="../images/demo-no.png">
</p></center>
-<p>If you're having trouble, make sure to hold the phone steady. If the camera is unable to focus,
- try moving further back from the barcode.</p>
-<p>When a barcode is found, the phone will beep and take you to the results screen, which describes
- what you found, and offers a choice of actions. Learn more:</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
+ focus, try moving the phone further or closer from the barcode.</p>
<ul>
- <li><a href="about1d.html">About 1D Barcodes</a></li>
- <li><a href="about2d.html">About 2D Barcodes</a></li>
+ <li><a href="about1d.html">About 1D barcodes</a></li>
+ <li><a href="about2d.html">About 2D barcodes</a></li>
</ul>
</body>
</html>
\ No newline at end of file
<html>
-<title>How To Share</title>
+<title>How to share</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>How To Share</center></h3>
+<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>
<html>
-<title>What's New</title>
+<title>What's new in this version</title>
<body>
<link rel="StyleSheet" href="style.css" type="text/css">
-<h3><center>What's New</center></h3>
+<h3><center>What's new in this version</center></h3>
<p>New in version 2.4, you can <a href="sharing.html">share information with your friends</a> using
barcodes:</p>
<center><p><img src="../images/scan-from-phone.png"></p></center>
-<p>There are lots of other improvements too:</p>
+<p>Other improvements include:</p>
<ul>
<li>Scanning is now twice as fast</li>
- <li>Contact info can now contain URLs, birthdays, and more</li>
- <li>Calendar events can be read from QR Codes, and added to your calendar</li>
+ <li>Contact info QR Codes can now contain URLs, birthdays, and more</li>
+ <li>Calendar events can be read from QR Codes and added to your calendar</li>
<li>Improved support for reading Japanese characters in QR Codes</li>
- <li>Searching Google will now use the phone's locale and go to the local site, instead of always
- using google.com</li>
- <li>This new HTML help system</li>
+ <li>Searching Google will now use the phone's locale for local results instead of always using
+ google.com</li>
+ <li>New HTML help system</li>
</ul>
</body>
</html>
\ No newline at end of file
<WebView android:id="@+id/help_contents"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"/>
+ android:layout_weight="1"
+ android:fadingEdge="vertical"
+ android:fadingEdgeLength="16dip"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:orientation="horizontal"
- android:gravity="right"
+ android:gravity="center"
android:padding="8px"
+ android:weightSum="1"
android:background="@color/help_button_view">
<Button android:id="@+id/back_button"
- android:layout_width="100px"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
+ android:layout_weight="0.35"
android:text="@string/button_back"/>
<Button android:id="@+id/done_button"
- android:layout_width="100px"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
+ android:layout_weight="0.35"
android:text="@string/button_done"/>
</LinearLayout>
<color name="contents_text">#ff000000</color>
<color name="encode_view">#ffffffff</color>
<color name="help_button_view">#ffcccccc</color>
- <color name="help_view">#ffffffff</color>
+ <color name="help_view">#ff404040</color>
<color name="result_image_border">#ffffffff</color>
<color name="result_minor_text">#ffc0c0c0</color>
<color name="result_points">#c000ff00</color>
projects / zxing.git / commitdiff