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.41 beta 1"
- android:versionCode="59"
+ android:versionName="3.5 beta 1"
+ android:versionCode="60"
android:installLocation="auto">
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
<uses-sdk android:minSdkVersion="3"
<link rel="stylesheet" href="style.css" type="text/css"/>
</head>
<body>
-<p><b>New in version 3.4:</b></p>
+<p><b>New in version 3.5:</b></p>
<ul>
- <li>Added support for WiFi base station credentials in QR Codes. Use the
- <a href="http://zxing.appspot.com/generator/">ZXing QR Code Generator</a> to make one.</li>
- <li>Added Code 93 support.</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>
+ <li>Added DataMatrix barcode reading.</li>
+ <li>Added Turkish translation.</li>
+ <li>Many bug fixes.</li>
</ul>
</body>
</html>
this.activity = activity;
this.rawResult = rawResult;
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() {
projects / zxing.git / commitdiff