From fdb26928e772c6664e1c8be807851c31a8340e55 Mon Sep 17 00:00:00 2001 From: dswitkin Date: Mon, 29 Mar 2010 17:40:53 +0000 Subject: [PATCH] Final changes for Barcode Scanner 3.22. git-svn-id: http://zxing.googlecode.com/svn/trunk@1263 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/AndroidManifest.xml | 4 ++-- android/assets/html/whatsnew.html | 6 ++++++ android/res/values/strings.xml | 6 +++--- android/res/xml/preferences.xml | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 90f4111a..21e640fb 100755 --- 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. --> + android:versionName="3.22" + android:versionCode="48"> diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index e284fb01..7b70644a 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,8 +3,14 @@

What's new in this version

+

New in version 3.22:

+
    +
  • Turned off the flashlight by default and added an option to enable it.
    • +
  • Added Hungarian translation.
    • +

New in version 3.21:

    +
  • Turned on the flashlight on some devices to help low-light scanning.
  • Fixed a bug with detecting camera resolutions on some devices.

New in version 3.2:

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 156b69a1..b91ffc6a 100755 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -64,7 +64,7 @@ Hi Place a barcode inside the viewfinder rectangle to scan it. Type - Time + Time Could not generate the requested barcode. Could not encode a barcode from the data provided. Generating a barcode\u2026 @@ -90,8 +90,8 @@ Settings Beep Vibrate - Front light - Enable front light, if available + Use front light + Improves scanning in low light on some phones, but may cause glare Result settings Custom search URL Use %s as a placeholder for the product ID diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml index 104d046b..5a8c564d 100755 --- a/android/res/xml/preferences.xml +++ b/android/res/xml/preferences.xml @@ -26,7 +26,7 @@ android:title="@string/preferences_decode_QR_title"/> -- 2.20.1