From: dswitkin Date: Thu, 3 Sep 2009 20:37:38 +0000 (+0000) Subject: Final changes for Barcode Scanner 2.93. X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=45da62761ecd96cb899633f317b83df020058455 Final changes for Barcode Scanner 2.93. git-svn-id: http://zxing.googlecode.com/svn/trunk@1046 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 034aa984..2275f374 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.93" + android:versionCode="30"> diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 2e79fb27..d1d39384 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,6 +3,10 @@

What's new in this version

+

New in version 2.93:

+
    +
  • Worked around an Android bug which could cause scanning to stop working after a while.
    • +

New in version 2.92:

  • Made another fix for the Samsung Galaxy.
    • diff --git a/android/build.xml b/android/build.xml index 8afd48b7..c038b41a 100644 --- a/android/build.xml +++ b/android/build.xml @@ -198,7 +198,7 @@ limitations under the License. - + diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java index 76115558..9523ce84 100755 --- a/android/src/com/google/zxing/client/android/CameraManager.java +++ b/android/src/com/google/zxing/client/android/CameraManager.java @@ -204,6 +204,11 @@ final class CameraManager { */ private void setCameraParameters() { Camera.Parameters parameters = mCamera.getParameters(); + Camera.Size size = parameters.getPreviewSize(); + Log.v(TAG, "Default preview size: " + size.width + ", " + size.height); + Log.v(TAG, "Default preview format: " + parameters.getPreviewFormat()); + Log.v(TAG, "Setting preview size: " + mScreenResolution.x + ", " + mScreenResolution.y); + parameters.setPreviewSize(mScreenResolution.x, mScreenResolution.y); // FIXME: This is a hack to turn the flash off on the Samsung Galaxy. @@ -213,8 +218,6 @@ final class CameraManager { parameters.set("flash-mode", "off"); mCamera.setParameters(parameters); - Log.v(TAG, "Setting params for preview: width " + mScreenResolution.x + " height " + - mScreenResolution.y); } private Point getScreenResolution() {