projects / zxing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a69b6a0)
Added the external storage permission to fix SD card writing issues and bumped the...
authordswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Wed, 28 Apr 2010 19:52:17 +0000 (19:52 +0000)
committerdswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Wed, 28 Apr 2010 19:52:17 +0000 (19:52 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/AndroidManifest.xml patch | blob | history
android/assets/html/whatsnew.html patch | blob | history
android/src/com/google/zxing/client/android/encode/EncodeActivity.java patch | blob | history

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 21e640f..0356432 100755 (executable)
--- 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. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.22"
-          android:versionCode="48">
+          android:versionName="3.3 beta 1"
+          android:versionCode="49">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             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="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.FLASHLIGHT"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 7b70644..3103413 100644 (file)
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -3,25 +3,14 @@
 <body>
 <link rel="StyleSheet" href="style.css" type="text/css">
 <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>
-  <li>Turned off the flashlight by default and added an option to enable it.</li>
-  <li>Added Hungarian translation.</li>
-</ul>
-<p>New in version 3.21:</p>
-<ul>
-  <li>Turned on the flashlight on some devices to help low-light scanning.</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>
+  <li>Added support for RSS-14 barcodes.</li>
+  <li>Turned off the flash on the Behold II.</li>
+  <li>Added the ability to send a QR Code generated with the Share feature.</li>
+  <li>Forced the beep sound off if the phone is in silent mode.</li>
+  <li>Allowed web sites to start Barcode Scanner and choose the URL the result is sent to.</li>
+  <li>Added Portuguese translation.</li>
 </ul>
 </body>
 </html>
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 562ebbf..4e90134 100755 (executable)
--- 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");
Unnamed repository; edit this file to name it for gitweb.