[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
dswitkin at google.com
dswitkin at google.com
Wed Aug 4 01:32:25 UTC 2010
The following commit has been merged in the upstream branch:
commit d2aeb353c99b8f7510d38676c1e7c2ed2f8dfd9a
Author: dswitkin at google.com <dswitkin at google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue Jun 29 21:11:27 2010 +0000
- 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 a59471c..e1ba0db 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. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android"
- android:versionName="3.32 beta 1"
- android:versionCode="54">
+ android:versionName="3.4 beta 1"
+ android:versionCode="55"
+ android:installLocation="auto">
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
<uses-sdk android:minSdkVersion="3"
android:targetSdkVersion="4"/>
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 52b1caf..a88c86f 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -4,24 +4,17 @@
<link rel="stylesheet" href="style.css" type="text/css"/>
</head>
<body>
-<p><b>New in version 3.31:</b></p>
+<p><b>New in version 3.4:</b></p>
<ul>
- <li>Fixed a bug which caused some devices not to scan from time to time.</li>
- <li>Added Arabic translation.</li>
- <li>Improved scanning speed.</li>
- <li>Added RSS Expanded support.</li>
- <li>Fixed a crash in the QR Code reader.</li>
- <li>Improved Chinese character support in QR Codes.</li>
-</ul>
-<p><b>New in version 3.3:</b></p>
-<ul>
- <li>Added support for RSS-14 barcodes.</li>
- <li>Diabled 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 and Danish translations.</li>
- <li>New Eclair-style icon.</li>
+ <li>Added suppport for WiFi base station creditials in QR Codes.</li>
+ <li>Added Code 93 support.</li>
+ <li>Added recognition of 5 digit UPC/EAN extensions.</li>
+ <li>Added bulk scan mode to the preferences.</li>
+ <li>Allowed the app to be moved to the SD card on Froyo devices.</li>
+ <li>Fixed a problem where scanning would not work when resuming the app.</li>
+ <li>Made Calendar event parsing more lenient.</li>
+ <li>Fixed crashes in the QR Encoder with missing data.</li>
+ <li>Updated the UI appearance a bit.</li>
</ul>
</body>
</html>
diff --git a/android/build.xml b/android/build.xml
index 9051234..fa020fc 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. -->
<property file="../build.properties"/>
<!-- Parts of the Android build system insist on the name 'sdk-location', so alias it. -->
- <property name="sdk-location" value="${android-home}"/>
+ <property name="sdk.dir" value="${android-home}"/>
<!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the default property values
@@ -52,11 +52,11 @@ limitations under the License.
<!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. -->
<path id="android.antlibs">
- <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
- <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
- <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
- <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
- <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path>
<taskdef name="setup"
@@ -85,7 +85,7 @@ limitations under the License.
<!-- Properties -->
- <property name="android-tools" value="${sdk-location}/tools" />
+ <property name="android-tools" value="${sdk.dir}/tools" />
<!-- Input directories -->
<property name="source-folder" value="src" />
@@ -154,7 +154,7 @@ limitations under the License.
<arg value="-S" />
<arg path="${resource-folder}" />
<arg value="-I" />
- <arg path="${android-jar}" />
+ <arg path="${android.jar}" />
</exec>
</target>
@@ -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}" />
</target>
@@ -275,7 +275,7 @@ limitations under the License.
<arg value="-f"/>
<arg value="-v"/>
<arg value="4"/>
- <arg value="${out-folder}/temp.apk"/>
+ <arg value="${out-folder}/temp.apk"/>
<arg value="${out-folder}/BarcodeScanner-debug.apk"/>
</exec>
</target>
diff --git a/android/default.properties b/android/default.properties
index b74c488..e2e8061 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 03e4203..48ab7e6 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 9e3f847..7a458b0 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"/>
<LinearLayout
diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
index 56cf1cd..50b3193 100755
--- a/android/res/layout-ldpi/capture.xml
+++ b/android/res/layout-ldpi/capture.xml
@@ -52,10 +52,10 @@
android:gravity="right">
<ImageView android:id="@+id/barcode_image_view"
- android:layout_width="160dip"
+ android:layout_width="150dip"
android:layout_height="wrap_content"
- android:maxWidth="160dip"
- android:maxHeight="160dip"
+ android:maxWidth="150dip"
+ android:maxHeight="150dip"
android:layout_marginBottom="4dip"
android:adjustViewBounds="true"
android:scaleType="fitEnd"/>
@@ -126,6 +126,28 @@
</LinearLayout>
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/meta_text_view_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_default_meta"
+ android:textColor="@color/result_minor_text"
+ android:textStyle="bold"
+ android:textSize="14sp"
+ android:paddingRight="4dip"/>
+
+ <TextView android:id="@+id/meta_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_minor_text"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
</LinearLayout>
<ScrollView
@@ -179,38 +201,13 @@
</LinearLayout>
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/transparent">
-
- <FrameLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
- android:background="@color/transparent"/>
-
- <LinearLayout android:id="@+id/status_view"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:background="@color/status_view"
- android:baselineAligned="false"
- android:padding="4dip">
-
- <TextView android:id="@+id/status_text_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
- android:layout_weight="1"
- android:text="@string/msg_default_status"
- android:textColor="@color/status_text"
- android.textSize="14sp"/>
-
- </LinearLayout>
-
- </LinearLayout>
+ <TextView android:id="@+id/status_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center_horizontal"
+ android:background="@color/transparent"
+ android:text="@string/msg_default_status"
+ android:textColor="@color/status_text"
+ android:textSize="14sp"/>
</FrameLayout>
diff --git a/android/res/layout/encode.xml b/android/res/layout/encode.xml
index 6ee2580..0e7001d 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">
-
+
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/encode_view"
@@ -40,7 +40,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textColor="@color/contents_text"
- android:textSize="22sp"
+ android:textSize="18sp"
android:paddingBottom="8dip"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml
index 27ddc42..3c96dde 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"/>
<ImageView
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index c2276ee..8a6d257 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -119,7 +119,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
PRODUCT_FORMATS.add(BarcodeFormat.EAN_13);
PRODUCT_FORMATS.add(BarcodeFormat.EAN_8);
PRODUCT_FORMATS.add(BarcodeFormat.RSS14);
- ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 3);
+ ONE_D_FORMATS = new Vector<BarcodeFormat>(PRODUCT_FORMATS.size() + 4);
ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
ONE_D_FORMATS.add(BarcodeFormat.CODE_39);
ONE_D_FORMATS.add(BarcodeFormat.CODE_93);
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list