From: dswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 10 Nov 2008 22:47:09 +0000 (+0000)
Subject: Hid the Share menu if the results screen was showing, since it didn't make sense... 
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=d408d2858bf39afdd2508a56785b3bf5c77f477a;p=zxing.git

Hid the Share menu if the results screen was showing, since it didn't make sense. Also change the autofocus delay to 1.5 seconds, to make it hunt a little less, and give the autoexposure system more time to run.

git-svn-id: http://zxing.googlecode.com/svn/trunk@683 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---

diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 01f0d349..388c936a 100755
--- a/android/src/com/google/zxing/client/android/CameraManager.java
+++ b/android/src/com/google/zxing/client/android/CameraManager.java
@@ -187,8 +187,8 @@ final class CameraManager {
     public void onAutoFocus(boolean success, Camera camera) {
       if (mAutoFocusHandler != null) {
         Message message = mAutoFocusHandler.obtainMessage(mAutoFocusMessage, success);
-        // Simulate continuous autofocus by sending a focus request every second.
-        mAutoFocusHandler.sendMessageDelayed(message, 1000);
+        // Simulate continuous autofocus by sending a focus request every 1.5 seconds.
+        mAutoFocusHandler.sendMessageDelayed(message, 1500);
         mAutoFocusHandler = null;
       }
     }
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index 53904b67..dcb54635 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -178,6 +178,14 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     return true;
   }
 
+  // Don't display the share menu item if the result overlay is showing.
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    super.onPrepareOptionsMenu(menu);
+    menu.findItem(SHARE_ID).setVisible(mLastResult == null);
+    return true;
+  }
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {