[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit 35ccd20b4e96d23d4257f73dc420c2f90d9674bf
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue Jun 15 19:56:32 2010 +0000

    ... and put back status text, in a simplified form?
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1430 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index 90818ae..2073812 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -179,4 +179,13 @@
 
   </LinearLayout>
 
+  <TextView android:id="@+id/status_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:text="@string/msg_default_status"
+            android:background="@color/transparent"
+            android:textColor="@color/status_text"
+            android.textSize="14sp"/>
+
 </FrameLayout>
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index 61fd4bd..f719bbb 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -136,6 +136,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private CaptureActivityHandler handler;
 
   private ViewfinderView viewfinderView;
+  private View statusView;
   private View resultView;
   private MediaPlayer mediaPlayer;
   private Result lastResult;
@@ -150,7 +151,6 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private String characterSet;
   private String versionName;
   private HistoryManager historyManager;
-  private boolean firstLaunch;
 
   private final OnCompletionListener beepListener = new BeepListener();
 
@@ -182,13 +182,14 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     CameraManager.init(getApplication());
     viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
     resultView = findViewById(R.id.result_view);
+    statusView = findViewById(R.id.status_view);
     handler = null;
     lastResult = null;
     hasSurface = false;
     historyManager = new HistoryManager(this);
     historyManager.trimHistory();
 
-    firstLaunch = showHelpOnFirstLaunch();
+    showHelpOnFirstLaunch();
   }
 
   @Override
@@ -260,10 +261,6 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
     copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
     initBeepSound();
-
-    if (!firstLaunch) {
-      Toast.makeText(this, R.string.msg_default_status, Toast.LENGTH_SHORT).show();      
-    }
   }
 
   private static Vector<BarcodeFormat> parseDecodeFormats(Intent intent) {
@@ -495,6 +492,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
 
   // Put up our own UI for how to handle the decoded contents.
   private void handleDecodeInternally(Result rawResult, Bitmap barcode) {
+    statusView.setVisibility(View.GONE);
     viewfinderView.setVisibility(View.GONE);
     resultView.setVisibility(View.VISIBLE);
 
@@ -690,6 +688,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
 
   private void resetStatusView() {
     resultView.setVisibility(View.GONE);
+    statusView.setVisibility(View.VISIBLE);
     viewfinderView.setVisibility(View.VISIBLE);
     lastResult = null;
   }

-- 
Multi-format 1D/2D barcode image processing library