Merge branch 'master' of https://github.com/zhongyu05/tracking

Author: Brandon Shroyer

tld-main/res/raw/parameters.properties

@@ -4,8 +4,8 @@ ncc_thesame=0.45
 valid=0.5
 num_ferns=10
 num_features_per_fern=14
-pos_thr_fern=0.15
-pos_thr_nn=0.30
+pos_thr_fern=0.13
+pos_thr_nn=0.25
 pos_thr_nn_valid=0.40
 
 num_closest_init=10

tld-main/src/com/trandi/opentld/MainActivity.java

@@ -451,6 +451,25 @@ public void run() {
 			}
     	}
     };	
+    
+    @Override
+    public void onBackPressed()
+    {
+         // code here to show dialog
+         super.onBackPressed();  // optional depending on your needs
+ 		mHttpclient.get(this, "http://roc.cs.rochester.edu/ccvideo/RegionSpeak/php/setInactive.php?session="+sessionName, new AsyncHttpResponseHandler() {
+		    @Override
+		    public void onSuccess(String response) {
+		    	finish();
+		    }
+		    @Override
+		    public void onFailure(int statusCode, org.apache.http.Header[] headers, byte[] responseBody, java.lang.Throwable error){
+		    	 Log.v("Main", "fail"+statusCode+responseBody+","+error.toString());
+		    	 Toast.makeText(getApplicationContext(), "Check internet connection.", Toast.LENGTH_SHORT).show();
+		    	 //sendingDialog.dismiss();
+		    }
+		});
+    }
 
     protected void onUserLeaveHint () {