Made a new fix to turn off the Samsung Galaxy flash, and cut release 2.91.

git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1035 59b500cc-1b3d-0410-9834-0bbf25fbcc57

3 files changed, 10 insertions, 4 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4721afca..920bb4be 100755
--- a/AndroidManifest.xml
+++ b/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.0 alpha1"
-          android:versionCode="24">
+          android:versionName="2.91"
+          android:versionCode="26">
   <uses-sdk android:minSdkVersion="3"/>
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
diff --git a/assets/html/whatsnew.html b/assets/html/whatsnew.html
index 43436763..734c2d0f 100644
--- a/assets/html/whatsnew.html
+++ b/assets/html/whatsnew.html
@@ -3,6 +3,11 @@
 <body>
 <link rel="StyleSheet" href="style.css" type="text/css">
 <h3><center>What's new in this version</center></h3>
+<p>New in version 2.91:</p>
+<ul>
+  <li>Forced the Samsung Galaxy flash off, which was interfering with scanning.</li>
+  <li>A few other minor fixes.</li>
+</ul>
 <p>New in version 2.9:</p>
 <ul>
   <li>Added a new custom search function for advanced users.</li>
diff --git a/src/com/google/zxing/client/android/CameraManager.java b/src/com/google/zxing/client/android/CameraManager.java
index cb33dd07..6a01783d 100755
--- a/src/com/google/zxing/client/android/CameraManager.java
+++ b/src/com/google/zxing/client/android/CameraManager.java
@@ -205,8 +205,9 @@ final class CameraManager {
     Camera.Parameters parameters = mCamera.getParameters();
     parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y);
 
-    // Disables the built-in flash if present. Hopefully devices will honor this setting.
-    parameters.set("flash-mode", "off");
+    // FIXME: This is a hack to turn the flash off on the Samsung Galaxy. In the future there
+    // will hopefully be a standard setting like "off" that all devices will honor.
+    parameters.set("flash-mode", "2");
     mCamera.setParameters(parameters);
     Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
         mScreenResolution.y);