From f889a908c5e40c1f073b2beb3fe9d13bf4f31e87 Mon Sep 17 00:00:00 2001 From: "dswitkin@google.com" Date: Fri, 10 Sep 2010 21:02:33 +0000 Subject: [PATCH 1/1] Fixed the Google Shopper button remaining visible after scanning a product, and bumped the version to 3.5 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk@1583 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/AndroidManifest.xml | 4 ++-- android/assets/html/whatsnew.html | 14 ++++---------- .../zxing/client/android/result/ResultHandler.java | 5 +++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index c0f943dc..81606d4d 100755 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -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. --> -

New in version 3.4:

+

New in version 3.5:

    -
  • Added support for WiFi base station credentials in QR Codes. Use the - ZXing QR Code Generator to make one.
    • -
  • Added Code 93 support.
    • -
  • Added bulk scan mode to the preferences.
    • -
  • Allowed the app to be moved to the SD card on Froyo devices.
    • -
  • Fixed scanning not working 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.
    • +
  • Added DataMatrix barcode reading.
    • +
  • Added Turkish translation.
    • +
  • Many bug fixes.
diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java index 3020dc55..5c881652 100644 --- a/android/src/com/google/zxing/client/android/result/ResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/ResultHandler.java @@ -94,6 +94,11 @@ public abstract class ResultHandler { 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() { -- 2.20.1