From: miles <miles@localhost>
Date: Fri, 20 Sep 2013 21:34:03 +0000 (+0000)
Subject: no changes, just compiled the apk
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=1dacd3d9034840b7fb6bcb9700a8ab10d2e82389;p=old-jaiswallab-svn%2F.git

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 cbecbcb..3dc554a 100644
--- 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 f5f0a2e..7d650b3 100644
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
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 3d7e8f7..796c42c 100644
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 54fcb86..cd2547d 100644
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 9cbc67b..d83d0af 100644
--- 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 7664104..4c26f31 100644
--- 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) {