From 27194b053a3e7b5fe01f2387629201510929d051 Mon Sep 17 00:00:00 2001 From: srowen Date: Sat, 21 Jan 2012 13:05:42 +0000 Subject: [PATCH] Misc changes suggested by lint/code inspection git-svn-id: https://zxing.googlecode.com/svn/trunk@2130 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/assets/html-en/about2d.html | 2 +- android/assets/html-en/index.html | 2 +- android/assets/html-en/scanning.html | 2 +- android/assets/html-en/sharing.html | 2 +- android/assets/html-en/whatsnew.html | 2 +- .../zxing/client/android/BeepManager.java | 2 +- .../zxing/client/android/LocaleManager.java | 2 +- .../zxing/client/android/ViewfinderView.java | 3 ++- .../result/AddressBookResultHandler.java | 20 +++++++------------ .../android/result/WifiResultHandler.java | 5 +---- .../supplement/BookResultInfoRetriever.java | 2 +- 11 files changed, 18 insertions(+), 26 deletions(-) diff --git a/android/assets/html-en/about2d.html b/android/assets/html-en/about2d.html index 645aee0c6..f850bd642 100644 --- a/android/assets/html-en/about2d.html +++ b/android/assets/html-en/about2d.html @@ -4,7 +4,7 @@ -

Barcode Scanner also understands how to read two dimensional barcodes, like QR +

Barcode Scanner also understands how to read two dimensional barcodes, like QR Codes and Data Matrix codes. For example, the codes below contain a hyperlink to the ZXing Project home page:

diff --git a/android/assets/html-en/index.html b/android/assets/html-en/index.html index 0e87d3a97..7cab35ec7 100644 --- a/android/assets/html-en/index.html +++ b/android/assets/html-en/index.html @@ -4,7 +4,7 @@ -

Barcode Scanner uses the camera on your phone to read barcodes and look up product +

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 such as QR Codes and Data Matrix. diff --git a/android/assets/html-en/scanning.html b/android/assets/html-en/scanning.html index 00e7be959..0423fbe0c 100644 --- a/android/assets/html-en/scanning.html +++ b/android/assets/html-en/scanning.html @@ -9,7 +9,7 @@

Yes   No

-

IMPORTANT: 1D barcodes like those found on products require a phone with autofocus. +

IMPORTANT: 1D barcodes like those found on products require a phone with autofocus. Without it, only QR Codes and Data Matrix 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.

diff --git a/android/assets/html-en/sharing.html b/android/assets/html-en/sharing.html index 11c16635b..3b6f578b4 100644 --- a/android/assets/html-en/sharing.html +++ b/android/assets/html-en/sharing.html @@ -4,7 +4,7 @@ -

In addition to scanning 2D barcodes, Barcode Scanner can also +

In addition to scanning 2D barcodes, Barcode Scanner 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:

Scan from phone

diff --git a/android/assets/html-en/whatsnew.html b/android/assets/html-en/whatsnew.html index ef57270c0..855861218 100644 --- a/android/assets/html-en/whatsnew.html +++ b/android/assets/html-en/whatsnew.html @@ -4,7 +4,7 @@ -

New in version 4.0:

+

New in version 4.0: