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

Fixed the Google Shopper button remaining visible after scanning a product, and bumped the version to 3.5 beta 1.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1583 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2010-09-10 21:02:33 +00:00
parent 1a83572864
commit 4c01e8897d
3 changed files with 11 additions and 12 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.41 beta 1" android:versionName="3.5 beta 1"
android:versionCode="59" android:versionCode="60"
android:installLocation="auto"> android:installLocation="auto">
<!-- 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"

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

@ -4,17 +4,11 @@
<link rel="stylesheet" href="style.css" type="text/css"/> <link rel="stylesheet" href="style.css" type="text/css"/>
</head> </head>
<body> <body>
<p><b>New in version 3.4:</b></p> <p><b>New in version 3.5:</b></p>
<ul> <ul>
<li>Added support for WiFi base station credentials in QR Codes. Use the <li>Added DataMatrix barcode reading.</li>
<a href="http://zxing.appspot.com/generator/">ZXing QR Code Generator</a> to make one.</li> <li>Added Turkish translation.</li>
<li>Added Code 93 support.</li> <li>Many bug fixes.</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 scanning not working 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> </ul>
</body> </body>
</html> </html>

5
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -94,6 +94,11 @@ public abstract class ResultHandler {
this.activity = activity; this.activity = activity;
this.rawResult = rawResult; this.rawResult = rawResult;
this.customProductSearch = parseCustomSearchURL(); this.customProductSearch = parseCustomSearchURL();
// Make sure the Shopper button is hidden by default. Without this, scanning a product followed
// by a QR Code would leave the button on screen among the QR Code actions.
Button shopperButton = (Button) activity.findViewById(R.id.shopper_button);
shopperButton.setVisibility(View.GONE);
} }
ParsedResult getResult() { ParsedResult getResult() {