projects / zxing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d84eea)
Made another fix for the Samsung Galaxy, and bumped the version to 2.92.
authordswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 21 Aug 2009 14:18:31 +0000 (14:18 +0000)
committerdswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Fri, 21 Aug 2009 14:18:31 +0000 (14:18 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@1036 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/AndroidManifest.xml patch | blob | history
android/assets/html/whatsnew.html patch | blob | history
android/src/com/google/zxing/client/android/CameraManager.java patch | blob | history

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 920bb4b..034aa98 100755 (executable)
--- 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="2.91"
-          android:versionCode="26">
+          android:versionName="2.92"
+          android:versionCode="28">
   <uses-sdk android:minSdkVersion="3"/>
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 734c2d0..2e79fb2 100644 (file)
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -3,6 +3,10 @@
 <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.92:</p>
+<ul>
+  <li>Made another fix for the Samsung Galaxy.</li>
+</ul>
 <p>New in version 2.91:</p>
 <ul>
   <li>Forced the Samsung Galaxy flash off, which was interfering with scanning.</li>
diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 6a01783..4da3746 100755 (executable)
--- a/android/src/com/google/zxing/client/android/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/CameraManager.java
@@ -205,9 +205,12 @@ final class CameraManager {
     Camera.Parameters parameters = mCamera.getParameters();
     parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y);
 
-    // 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");
+    // FIXME: This is a hack to turn the flash off on the Samsung Galaxy.
+    parameters.set("flash-value", 2);
+
+    // This is the standard setting to turn the flash off that all devices should honor.
+    parameters.set("flash-mode", "off");
+
     mCamera.setParameters(parameters);
     Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
         mScreenResolution.y);
Unnamed repository; edit this file to name it for gitweb.