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

Added the external storage permission to fix SD card writing issues and bumped the version to 3.3 beta 1.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2010-04-28 19:52:17 +00:00
parent ea893d0883
commit 10116044ec
3 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
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.22" android:versionName="3.3 beta 1"
android:versionCode="48"> android:versionCode="49">
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. --> <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
<uses-sdk android:minSdkVersion="3" <uses-sdk android:minSdkVersion="3"
android:targetSdkVersion="4"/> android:targetSdkVersion="4"/>
@ -132,4 +132,5 @@ versionName is 2.31, 2.4, or 3.0. -->
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.FLASHLIGHT"/> <uses-permission android:name="android.permission.FLASHLIGHT"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest> </manifest>

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

@ -3,25 +3,14 @@
<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 3.22:</p> <p>New in version 3.3:</p>
<ul> <ul>
<li>Turned off the flashlight by default and added an option to enable it.</li> <li>Added support for RSS-14 barcodes.</li>
<li>Added Hungarian translation.</li> <li>Turned off the flash on the Behold II.</li>
</ul> <li>Added the ability to send a QR Code generated with the Share feature.</li>
<p>New in version 3.21:</p> <li>Forced the beep sound off if the phone is in silent mode.</li>
<ul> <li>Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.</li>
<li>Turned on the flashlight on some devices to help low-light scanning.</li> <li>Added Portuguese translation.</li>
<li>Fixed a bug with detecting camera resolutions on some devices.</li>
</ul>
<p>New in version 3.2:</p>
<ul>
<li>Added a Google Shopper button when scanning products.</li>
<li>Allowed devices without autofocus to see Barcode Scanner in the Market.</li>
<li>New Finnish, Swedish, Dutch, and Czech translations.</li>
<li>Fixed a possible crash on unsupported hardware.</li>
<li>Better layouts on QVGA devices like the HTC Tattoo.</li>
<li>Added the ability to email your scan history.</li>
<li>New high res icon and minor bug fixes.</li>
</ul> </ul>
</body> </body>
</html> </html>

9
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -158,10 +158,8 @@ public final class EncodeActivity extends Activity {
String contents = qrCodeEncoder.getContents(); String contents = qrCodeEncoder.getContents();
Bitmap bitmap; Bitmap bitmap;
try { try {
bitmap = QRCodeEncoder.encodeAsBitmap(contents, bitmap = QRCodeEncoder.encodeAsBitmap(contents, BarcodeFormat.QR_CODE,
BarcodeFormat.QR_CODE, SHARE_BARCODE_DIMENSION, SHARE_BARCODE_DIMENSION);
SHARE_BARCODE_DIMENSION,
SHARE_BARCODE_DIMENSION);
} catch (WriterException we) { } catch (WriterException we) {
Log.w(TAG, we.toString()); Log.w(TAG, we.toString());
return true; return true;
@ -195,7 +193,8 @@ public final class EncodeActivity extends Activity {
} }
Intent intent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:")); 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_TEXT, qrCodeEncoder.getContents());
intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + barcodeFile.getAbsolutePath())); intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + barcodeFile.getAbsolutePath()));
intent.setType("image/png"); intent.setType("image/png");