From: dswitkin@google.com Date: Tue, 29 Jun 2010 21:11:27 +0000 (+0000) Subject: - Bumped version to 3.4 beta 1. X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=d2aeb353c99b8f7510d38676c1e7c2ed2f8dfd9a - Bumped version to 3.4 beta 1. - Fixed two crashes on low DPI devices because of missing/stale views in layout-ldpi/capture.xml. - Added support for apps on SD card on Froyo. - Updated SDK to 8. - Tweaked some font sizes. - Updated the What's New page. git-svn-id: http://zxing.googlecode.com/svn/trunk@1464 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index a59471c5..e1ba0db0 100755 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -20,8 +20,9 @@ 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.4 beta 1" + android:versionCode="55" + android:installLocation="auto">

diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 52b1cafa..a88c86f9 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -4,24 +4,17 @@ -

New in version 3.31:

New in version 3.4:

Fixed a bug which caused some devices not to scan from time to time.
Added Arabic translation.
Improved scanning speed.
Added RSS Expanded support.
Fixed a crash in the QR Code reader.
Improved Chinese character support in QR Codes.

New in version 3.3:

Added support for RSS-14 barcodes.
Diabled 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 and Danish translations.
New Eclair-style icon.
Added suppport for WiFi base station creditials in QR Codes.
Added Code 93 support.
Added recognition of 5 digit UPC/EAN extensions.
Added bulk scan mode to the preferences.
Allowed the app to be moved to the SD card on Froyo devices.
Fixed a problem where scanning would not work when resuming the app.
Made Calendar event parsing more lenient.
Fixed crashes in the QR Encoder with missing data.
Updated the UI appearance a bit.

diff --git a/android/build.xml b/android/build.xml index 90512348..fa020fce 100644 --- a/android/build.xml +++ b/android/build.xml @@ -20,7 +20,7 @@ limitations under the License. to find the SDK location, I've removed it and pointed us at the global ZXing build.properties. --> - + - - - - - + + + + + - + @@ -154,7 +154,7 @@ limitations under the License. - + @@ -239,7 +239,7 @@ limitations under the License. manifest="AndroidManifest.xml" resources="${resource-folder}" assets="${asset-folder}" - androidjar="${android-jar}" + androidjar="${android.jar}" outfolder="${out-folder}" basename="${ant.project.name}" /> @@ -275,7 +275,7 @@ limitations under the License. - + diff --git a/android/default.properties b/android/default.properties index b74c4880..e2e8061f 100644 --- a/android/default.properties +++ b/android/default.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-4 +target=android-8 diff --git a/android/res/layout-land/encode.xml b/android/res/layout-land/encode.xml index 03e4203b..48ab7e64 100755 --- a/android/res/layout-land/encode.xml +++ b/android/res/layout-land/encode.xml @@ -34,7 +34,7 @@ android:layout_gravity="center_vertical" android:gravity="center" android:textColor="@color/contents_text" - android:textSize="22sp" + android:textSize="18sp" android:paddingRight="8dip" android:paddingTop="8dip" android:paddingBottom="8dip"/> diff --git a/android/res/layout-land/share.xml b/android/res/layout-land/share.xml index 9e3f8473..7a458b04 100755 --- a/android/res/layout-land/share.xml +++ b/android/res/layout-land/share.xml @@ -28,7 +28,7 @@ android:layout_height="0dip" android:layout_weight="1" android:textColor="@color/share_text" - android:textSize="22sp" + android:textSize="18sp" android:text="@string/msg_share_explanation"/> @@ -126,6 +126,28 @@ + + + + + + + + - - - - - - - - - - - + diff --git a/android/res/layout/encode.xml b/android/res/layout/encode.xml index 6ee25801..0e7001d9 100755 --- a/android/res/layout/encode.xml +++ b/android/res/layout/encode.xml @@ -21,7 +21,7 @@ android:layout_height="fill_parent" android:fillViewport="true" android:background="@color/encode_view"> - + diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml index 27ddc42c..3c96dded 100755 --- a/android/res/layout/share.xml +++ b/android/res/layout/share.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:textColor="@color/share_text" - android:textSize="22sp" + android:textSize="18sp" android:text="@string/msg_share_explanation"/> (PRODUCT_FORMATS.size() + 3); + ONE_D_FORMATS = new Vector(PRODUCT_FORMATS.size() + 4); ONE_D_FORMATS.addAll(PRODUCT_FORMATS); ONE_D_FORMATS.add(BarcodeFormat.CODE_39); ONE_D_FORMATS.add(BarcodeFormat.CODE_93);