no changes, just compiled the apk

svn path=/; revision=506

diff --git a/Personnel/justin/lab inventory/.classpath b/Personnel/justin/lab inventory/.classpath
index cbecbcb87ed14aa587e467baea009dc9f7107195..3dc554a2daef10019a9cc4b616f728ae2135c7f9 100644 (file)
--- a/Personnel/justin/lab inventory/.classpath
+++ b/Personnel/justin/lab inventory/.classpath
@@ -5,6 +5,7 @@
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-       <classpathentry kind="lib" path="/home/miles/lab inventory/libs/ZXing-2.2.zip"/>
+       <classpathentry kind="lib" path="/home/miles/Documents/Development/jaiswallab/Personnel/miles/lab inventory/libs/ZXing-2.2.zip"/>
+       <classpathentry kind="lib" path="libs/android-integration-2.2.jar"/>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>

diff --git a/Personnel/justin/lab inventory/bin/classes.dex b/Personnel/justin/lab inventory/bin/classes.dex
index f5f0a2e509fe9aca5ce03632b7dbbcb3e114bd9c..7d650b3480b4a0874d63f5173acb023bfd87259c 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/classes.dex and b/Personnel/justin/lab inventory/bin/classes.dex differ

diff --git a/Personnel/justin/lab inventory/bin/dexedLibs/android-integration-2.2-e618ac02460086a35e3f80df7489d91e.jar b/Personnel/justin/lab inventory/bin/dexedLibs/android-integration-2.2-e618ac02460086a35e3f80df7489d91e.jar
new file mode 100644 (file)
index 0000000..e8a9221
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/dexedLibs/android-integration-2.2-e618ac02460086a35e3f80df7489d91e.jar differ

diff --git a/Personnel/justin/lab inventory/bin/lab inventory.apk b/Personnel/justin/lab inventory/bin/lab inventory.apk
index 3d7e8f7c61e163ec66f40e53b9a069028a8ba06e..796c42ca322dcb105eb6a307286d00a9d19ad9bd 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/lab inventory.apk and b/Personnel/justin/lab inventory/bin/lab inventory.apk differ

diff --git a/Personnel/justin/lab inventory/bin/resources.ap_ b/Personnel/justin/lab inventory/bin/resources.ap_
index 54fcb86ec033c78196cffb996760adf4562146f1..cd2547d4f2b0b3489b630ed9de68a15aaba26f14 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/resources.ap_ and b/Personnel/justin/lab inventory/bin/resources.ap_ differ

diff --git a/Personnel/justin/lab inventory/res/layout/activity_main.xml b/Personnel/justin/lab inventory/res/layout/activity_main.xml
index 9cbc67b14c73bde97ae03ef2a6eb56461b0f70b5..d83d0af275e436ce10b06a8a877968798b0b1bd0 100644 (file)
--- a/Personnel/justin/lab inventory/res/layout/activity_main.xml
+++ b/Personnel/justin/lab inventory/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
         android:text="Data 1" />
 
     <EditText
-        android:id="@+id/EditText01"
+        android:id="@+id/editText2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
@@ -32,20 +32,20 @@
         android:text="Data 2" />
 
     <EditText
-        android:id="@+id/EditText02"
+        android:id="@+id/editText3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/EditText01"
+        android:layout_below="@+id/editText2"
         android:ems="10"
         android:text="Data 3" />
 
     <EditText
-        android:id="@+id/EditText03"
+        android:id="@+id/editText4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/EditText02"
+        android:layout_below="@+id/editText3"
         android:ems="10"
         android:text="Data 4" />
 

diff --git a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
index 7664104631b3124f04325533d8cd61f690b18fe3..4c26f3140487727e95ac0ce434ccff4cee4144d7 100644 (file)
--- a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
+++ b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
@@ -53,8 +53,8 @@ public class MainActivity extends Activity {
        printingNewQR = true;
        recognizingQR = false;
        text1.setText("Print QR button clicked");
-       IntentIntegrator intentIntegrator = new IntentIntegrator(this);
-       intentIntegrator.initiateScan();
+       //IntentIntegrator intentIntegrator = new IntentIntegrator(this);
+       //intentIntegrator.initiateScan();
     }
     
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {