X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=7f98e7f6266fb4de707009155063f0cb6bb95577;hb=refs%2Ftags%2Faltosdroid_v1.1.9.3;hp=b1fc8d30fd091d124c52619f2c930e763235e843;hpb=8cb09f8a3e2dae5f7f3d2d3dbbc81ba40b491e75;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b1fc8d30..7f98e7f6 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -81,6 +81,7 @@ public class AltosDroid extends Activity { // Generic field for extras at the bottom private TextView mTextView; + private TextView mVersion; // Service private boolean mIsBound = false; @@ -118,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); @@ -134,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; } } @@ -249,6 +250,11 @@ public class AltosDroid extends Activity { mTextView.setClickable(false); mTextView.setLongClickable(false); + mVersion = (TextView) findViewById(R.id.version); + mVersion.setText("Version: " + BuildInfo.version + + " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz + + " (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")"); + mCallsignView = (TextView) findViewById(R.id.callsign_value); mRSSIView = (TextView) findViewById(R.id.rssi_value); mSerialView = (TextView) findViewById(R.id.serial_value);