[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 3b22568664b0c0017ea793fd3cf5fde433e95717

Wed Jun 30 15:30:04 UTC 2010

The following commit has been merged in the upstream branch:
commit fdb26928e772c6664e1c8be807851c31a8340e55
Author: dswitkin <dswitkin at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Mon Mar 29 17:40:53 2010 +0000

    Final changes for Barcode Scanner 3.22.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1263 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 90f4111..21e640f 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. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.21"
-          android:versionCode="47">
+          android:versionName="3.22"
+          android:versionCode="48">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index e284fb0..7b70644 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -3,8 +3,14 @@
 <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.22:</p>
+<ul>
+  <li>Turned off the flashlight by default and added an option to enable it.</li>
+  <li>Added Hungarian translation.</li>
+</ul>
 <p>New in version 3.21:</p>
 <ul>
+  <li>Turned on the flashlight on some devices to help low-light scanning.</li>
   <li>Fixed a bug with detecting camera resolutions on some devices.</li>
 </ul>
 <p>New in version 3.2:</p>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 156b69a..b91ffc6 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -64,7 +64,7 @@
   <string name="msg_default_mms_subject">Hi</string>
   <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
   <string name="msg_default_type">Type</string>
-  <string name="msg_default_time">Time</string>  
+  <string name="msg_default_time">Time</string>
   <string name="msg_encode_barcode_failed">Could not generate the requested barcode.</string>
   <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
   <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
@@ -90,8 +90,8 @@
   <string name="preferences_name">Settings</string>
   <string name="preferences_play_beep_title">Beep</string>
   <string name="preferences_vibrate_title">Vibrate</string>
-  <string name="preferences_front_light_title">Front light</string>
-  <string name="preferences_front_light_summary">Enable front light, if available</string>  
+  <string name="preferences_front_light_title">Use front light</string>
+  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare</string>  
   <string name="preferences_result_title">Result settings</string>
   <string name="preferences_custom_product_search_title">Custom search URL</string>
   <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID</string>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index 104d046..5a8c564 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -26,7 +26,7 @@
         android:title="@string/preferences_decode_QR_title"/>
     <CheckBoxPreference
         android:key="preferences_front_light"
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:title="@string/preferences_front_light_title"
         android:summary="@string/preferences_front_light_summary"/>
   </PreferenceCategory>

-- 
Multi-format 1D/2D barcode image processing library

