Merge branch 'robot_control' into develop

2014-02-11 17:50:01 -04:30
parent db6befbee9 e87c59db48
commit 2028c74904
2 changed files with 11 additions and 12 deletions
--- a/assets/data/gfx/gui/orange_glowy_button.png
+++ b/assets/data/gfx/gui/orange_glowy_button.png
--- a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
+++ b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
@@ -81,7 +81,6 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
 				switch(status){
 				case LoaderCallbackInterface.SUCCESS:
 					ocvOn = true;
-					Toast.makeText(uiContext, R.string.ocv_success, Toast.LENGTH_LONG).show();
 					break;
 				default:
 					Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show();