Updated Playground - test purpose only

.gitignore

@@ -31,3 +31,5 @@ build/
 gen-external-apklibs/
 native/build
 native/build.o
+/javadoc.xml
+/doc

AndroidManifest.xml

@@ -39,6 +39,9 @@
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8" />
+        
+        <meta-data android:name="android.nfc.disable_beam_default"
+         	android:value="true" />
 
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
@@ -48,14 +51,12 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>              
-  
+            </intent-filter>      
         </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" >            
-       
+            android:label="@string/app_name" >          
         </activity>
         <activity
             android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
@@ -122,6 +123,8 @@
             android:authorities="de.tudarmstadt.informatik.hostage.provider"
             android:exported="false" >
         </provider>
+        
+        
     </application>
 
 </manifest>

res/layout/activity_playground.xml

@@ -14,18 +14,28 @@
         android:orientation="horizontal" >
 
         <Button
-            android:id="@+id/buttonSyncServer"
+            android:id="@+id/buttonBluetooth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:onClick="syncData"
-            android:text="Sync Data" />
+            android:onClick="startBluetooth"
+            android:text="Bluetooth" />
         
         <Button
-            android:id="@+id/buttonStartNFC"
+            android:id="@+id/buttonNFC"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="startNFC"
-            android:text="start NFC" />
+            android:text="NFC" />
+        
+        <Button
+            android:id="@+id/buttonServer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="startServer"
+            android:text="Server" />
+        
+
+        
 
     </LinearLayout>
 

src/de/tudarmstadt/informatik/hostage/ui/PlayGroundActivity.java

@@ -8,16 +8,12 @@ import java.util.Random;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
 import android.view.Menu;
 import android.view.View;
 import android.widget.TextView;
 import de.tudarmstadt.informatik.hostage.R;
-import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.logging.NetworkRecord;
 import de.tudarmstadt.informatik.hostage.logging.SyncInfoRecord;
-import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
 import de.tudarmstadt.informatik.hostage.sync.bluetooth.BluetoothSyncActivity;
 import de.tudarmstadt.informatik.hostage.sync.nfc.NFCSync;
@@ -51,12 +47,16 @@ public class PlayGroundActivity extends Activity {
 	}
 
 	public void startNFC(View view) {
-		startActivity(new Intent(this, TracingSyncActivity.class));
+		startActivity(new Intent(this, NFCSync.class));
 	}
 
-	public void syncData(View view) {
+	public void startBluetooth(View view) {
 		startActivity(new Intent(this, BluetoothSyncActivity.class));
 	}
+	
+	public void startServer(View view) {
+		startActivity(new Intent(this, TracingSyncActivity.class));
+	}
 
 	private String createRandomBSSID() {
 		Random rnd = new Random();