diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-25 00:09:01 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-25 00:09:01 -0700 |
| commit | 282f0451dd141db3304ab73e4020a849e59721eb (patch) | |
| tree | 53251ad243a73d799b64a4b55d8ac4d6797add90 /altosdroid/src | |
| parent | 0680d62d57496cea7ae4f1ef317c46e689b28e21 (diff) | |
| parent | 78e1de481bfdbf7c7bb908c317b23c8ee275c84f (diff) | |
Merge remote-tracking branch 'mjb/altosdroid'
Diffstat (limited to 'altosdroid/src')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 6 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b1fc8d30..ab1fb0de 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; @@ -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); diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in b/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in index 763f814e..e9b3011a 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in +++ b/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in @@ -18,11 +18,13 @@ package org.altusmetrum.AltosDroid; public class BuildInfo { - public static final String git_describe = "@DESCRIBE@"; public static final String version = "@VERSION@"; + public static final String git_describe = "@DESCRIBE@"; + public static final String branch = "@BRANCH@"; public static final String commitnum = "@COMMITNUM@"; public static final String commithash = "@COMMITHASH@"; public static final String builddate = "@BUILDDATE@"; public static final String buildtime = "@BUILDTIME@"; + public static final String buildtz = "@BUILDTZ@"; } |