mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1035 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-08-19 14:52:16 +00:00
parent 3cab89a732
commit fc9bc55213
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -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. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="3.0 alpha1" android:versionName="2.91"
android:versionCode="24"> android:versionCode="26">
<uses-sdk android:minSdkVersion="3"/> <uses-sdk android:minSdkVersion="3"/>
<application android:icon="@drawable/launcher_icon" <application android:icon="@drawable/launcher_icon"
android:label="@string/app_name"> android:label="@string/app_name">

5
android/assets/html/whatsnew.html
View file

@ -3,6 +3,11 @@
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<h3><center>What's new in this version</center></h3> <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> <p>New in version 2.9:</p>
<ul> <ul>
<li>Added a new custom search function for advanced users.</li> <li>Added a new custom search function for advanced users.</li>

5
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -205,8 +205,9 @@ final class CameraManager {
Camera.Parameters parameters = mCamera.getParameters(); Camera.Parameters parameters = mCamera.getParameters();
parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y); parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y);
// Disables the built-in flash if present. Hopefully devices will honor this setting. // FIXME: This is a hack to turn the flash off on the Samsung Galaxy. In the future there
parameters.set("flash-mode", "off"); // will hopefully be a standard setting like "off" that all devices will honor.
parameters.set("flash-mode", "2");
mCamera.setParameters(parameters); mCamera.setParameters(parameters);
Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " + Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " +
mScreenResolution.y); mScreenResolution.y);