summaryrefslogtreecommitdiff
path: root/altosdroid/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-02-10 01:21:52 -0800
committerKeith Packard <keithp@keithp.com>2013-02-10 01:21:52 -0800
commitbf88c5f829ea5d32043431945e862a9f6c96740a (patch)
tree6ab88a057b3f69f16b8d048ae132bcbe31812dfe /altosdroid/src
parent32270296671aac3b3ba15f9c1777bcdd77b9c36c (diff)
parentd05a77992df983b9fa79f0e2b20d2c6b387c180c (diff)
Merge remote-tracking branch 'mjb/master'
Diffstat (limited to 'altosdroid/src')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index fe4907dd..caa1a1c5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -119,7 +119,7 @@ public class AltosDroid extends Activity {
Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
ad.mAltosVoice.speak("Connected");
//TEST!
- ad.mTextView.setText(Dumper.dump(ad.mConfigData));
+ //ad.mTextView.setText(Dumper.dump(ad.mConfigData));
break;
case TelemetryService.STATE_CONNECTING:
ad.mTitle.setText(R.string.title_connecting);
@@ -135,7 +135,7 @@ public class AltosDroid extends Activity {
case MSG_TELEMETRY:
ad.update_ui((AltosState) msg.obj);
// TEST!
- ad.mTextView.setText(Dumper.dump(msg.obj));
+ //ad.mTextView.setText(Dumper.dump(msg.obj));
break;
}
}