Merge branch 'master' of https://github.com/Determinant/piztor

Conflicts:
	client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
	client/Piztor/gen/com/macaroon/piztor/R.java
	client/Piztor/res/values/strings.xml
	client/bin/classes/com/macaroon/piztor/ActStatus.class
	client/bin/classes/com/macaroon/piztor/EmptyStatus.class
	client/bin/classes/com/macaroon/piztor/Setting.class
	client/src/com/macaroon/piztor/AppMgr.java
	client/src/com/macaroon/piztor/Setting.java

1 files changed, 0 insertions, 50 deletions

diff --git a/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/AndroidGPSTrackingActivity.java b/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/AndroidGPSTrackingActivity.java
deleted file mode 100644
index cdc1413..0000000
--- a/client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/AndroidGPSTrackingActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.example.gpstracking;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.Toast;
-
-public class AndroidGPSTrackingActivity extends Activity {
-	
-	Button btnShowLocation;
-	
-	// GPSTracker class
-	GPSTracker gps;
-	
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-    	
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-        
-        btnShowLocation = (Button) findViewById(R.id.btnShowLocation);
-        
-        // show location button click event
-        btnShowLocation.setOnClickListener(new View.OnClickListener() {
-			
-			@Override
-			public void onClick(View arg0) {		
-				// create class object
-		        gps = new GPSTracker(AndroidGPSTrackingActivity.this);
-
-				// check if GPS enabled		
-		        if(gps.canGetLocation()){
-		        	
-		        	double latitude = gps.getLatitude();
-		        	double longitude = gps.getLongitude();
-		        	
-		        	Toast.makeText(getApplicationContext(), "Your Location is - \nLat: " + latitude + "\nLong: " + longitude, Toast.LENGTH_LONG).show();	
-		        }else{
-		        	// can't get location
-		        	// GPS or Network is not enabled
-		        	// Ask user to enable GPS/network in settings
-		        	gps.showSettingsAlert();
-		        }
-				
-			}
-		});
-    }
-    
-}
\ No newline at end of file