mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Created Barcode Scanner 3.31 beta 1.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1391 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2010-05-26 16:58:15 +00:00
parent 217e7fd92d
commit a0ecb24f54
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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.3" android:versionName="3.31 beta 1"
android:versionCode="51"> android:versionCode="52">
<!-- 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"/>

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

@ -2,7 +2,16 @@
<title>What's new in this version</title> <title>What's new in this version</title>
<body> <body>
<link rel="StyleSheet" href="style.css" type="text/css"> <link rel="StyleSheet" href="style.css" type="text/css">
<p>New in version 3.3:</p> <p><b>New in version 3.31:</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 characeter support in QR Codes.</li>
</ul>
<p><b>New in version 3.3:</b></p>
<ul> <ul>
<li>Added support for RSS-14 barcodes.</li> <li>Added support for RSS-14 barcodes.</li>
<li>Diabled the flash on the Behold II.</li> <li>Diabled the flash on the Behold II.</li>

14
android/src/com/google/zxing/client/android/HelpActivity.java
View file

@ -36,7 +36,6 @@ import android.widget.Button;
* @author dswitkin@google.com (Daniel Switkin) * @author dswitkin@google.com (Daniel Switkin)
*/ */
public final class HelpActivity extends Activity { public final class HelpActivity extends Activity {
private static final String TAG = HelpActivity.class.getSimpleName(); private static final String TAG = HelpActivity.class.getSimpleName();
// Actually guessing at the Desire's MODEL for now: // Actually guessing at the Desire's MODEL for now:
@ -51,6 +50,7 @@ public final class HelpActivity extends Activity {
public static final String WHATS_NEW_PAGE = "whatsnew.html"; public static final String WHATS_NEW_PAGE = "whatsnew.html";
private static final String BASE_URL = "file:///android_asset/html/"; private static final String BASE_URL = "file:///android_asset/html/";
private static boolean initialized = false;
private WebView webView; private WebView webView;
private Button backButton; private Button backButton;
@ -101,12 +101,11 @@ public final class HelpActivity extends Activity {
backButton.setOnClickListener(backListener); backButton.setOnClickListener(backListener);
Button doneButton = (Button)findViewById(R.id.done_button); Button doneButton = (Button)findViewById(R.id.done_button);
doneButton.setOnClickListener(doneListener); doneButton.setOnClickListener(doneListener);
}
@Override if (!initialized) {
public void onResume() { initialized = true;
super.onResume(); checkBuggyDevice();
checkBuggyDevice(); }
} }
private void checkBuggyDevice() { private void checkBuggyDevice() {
@ -119,7 +118,7 @@ public final class HelpActivity extends Activity {
builder.setMessage(R.string.msg_buggy); builder.setMessage(R.string.msg_buggy);
builder.setPositiveButton(R.string.button_ok, groupsListener); builder.setPositiveButton(R.string.button_ok, groupsListener);
builder.setNegativeButton(R.string.button_cancel, null); builder.setNegativeButton(R.string.button_cancel, null);
builder.create().show(); builder.show();
break; break;
} }
} }
@ -149,5 +148,4 @@ public final class HelpActivity extends Activity {
backButton.setEnabled(view.canGoBack()); backButton.setEnabled(view.canGoBack());
} }
} }
} }