From: dswitkin Date: Wed, 28 Apr 2010 19:52:17 +0000 (+0000) Subject: Added the external storage permission to fix SD card writing issues and bumped the... X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=bf981d8eadb63db8b5ad81b46b5155d4ebe2752f Added the external storage permission to fix SD card writing issues and bumped the version to 3.3 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 21e640fb..03564322 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="3.3 beta 1" + android:versionCode="49">

@@ -132,4 +132,5 @@ versionName is 2.31, 2.4, or 3.0. -->

diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 7b70644a..31034134 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,25 +3,14 @@

What's new in this version

New in version 3.22:

New in version 3.3:

Turned off the flashlight by default and added an option to enable it.
Added Hungarian translation.

New in version 3.21:

Turned on the flashlight on some devices to help low-light scanning.
Fixed a bug with detecting camera resolutions on some devices.

New in version 3.2:

Added a Google Shopper button when scanning products.
Allowed devices without autofocus to see Barcode Scanner in the Market.
New Finnish, Swedish, Dutch, and Czech translations.
Fixed a possible crash on unsupported hardware.
Better layouts on QVGA devices like the HTC Tattoo.
Added the ability to email your scan history.
New high res icon and minor bug fixes.
Added support for RSS-14 barcodes.
Turned off the flash on the Behold II.
Added the ability to send a QR Code generated with the Share feature.
Forced the beep sound off if the phone is in silent mode.
Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.
Added Portuguese translation.

diff --git a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java index 562ebbf4..4e901341 100755 --- a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java +++ b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java @@ -158,10 +158,8 @@ public final class EncodeActivity extends Activity { String contents = qrCodeEncoder.getContents(); Bitmap bitmap; try { - bitmap = QRCodeEncoder.encodeAsBitmap(contents, - BarcodeFormat.QR_CODE, - SHARE_BARCODE_DIMENSION, - SHARE_BARCODE_DIMENSION); + bitmap = QRCodeEncoder.encodeAsBitmap(contents, BarcodeFormat.QR_CODE, + SHARE_BARCODE_DIMENSION, SHARE_BARCODE_DIMENSION); } catch (WriterException we) { Log.w(TAG, we.toString()); return true; @@ -195,7 +193,8 @@ public final class EncodeActivity extends Activity { } Intent intent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:")); - intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " - " + qrCodeEncoder.getTitle()); + intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " - " + + qrCodeEncoder.getTitle()); intent.putExtra(Intent.EXTRA_TEXT, qrCodeEncoder.getContents()); intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + barcodeFile.getAbsolutePath())); intent.setType("image/png");