diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 4721afca0..920bb4bed 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="2.91" + android:versionCode="26"> diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 434367633..734c2d0f3 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,6 +3,11 @@

What's new in this version

+

New in version 2.91:

+
    +
  • Forced the Samsung Galaxy flash off, which was interfering with scanning.
    • +
  • A few other minor fixes.
    • +

New in version 2.9:

  • Added a new custom search function for advanced users.
    • diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java index cb33dd07e..6a01783d8 100755 --- a/android/src/com/google/zxing/client/android/CameraManager.java +++ b/android/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);