From 5ad62b07bef41921b46cb7251072dc24290ee4c9 Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Wed, 24 Oct 2012 20:52:09 +1300
Subject: altosdroid: Add branch to BuildInfo

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'altosdroid/src')

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@";
 }
 
-- 
cgit v1.2.3


From 78e1de481bfdbf7c7bb908c317b23c8ee275c84f Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Wed, 24 Oct 2012 20:54:18 +1300
Subject: altosdroid: Add version information to UI

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altosdroid/res/layout/altosdroid.xml               | 35 +++++++++++++++-------
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |  6 ++++
 2 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'altosdroid/src')

diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index f185ea9f..691c5e04 100644
--- a/altosdroid/res/layout/altosdroid.xml
+++ b/altosdroid/res/layout/altosdroid.xml
@@ -335,15 +335,30 @@
         </RelativeLayout>
 
 
-        <TextView
-	        android:id="@+id/text"
-	        android:layout_width="fill_parent"
-	        android:layout_height="0dip"
-	        android:layout_alignParentBottom="true"
-	        android:layout_below="@+id/longitude_container"
-	        android:gravity="bottom"
-	        android:scrollbars="vertical"
-	        android:textSize="7dp"
-	        android:typeface="monospace" />
+        <RelativeLayout
+            android:id="@+id/text_container"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_below="@id/longitude_container" >
+
+        	<TextView
+        	    android:id="@+id/text"
+        	    android:layout_width="fill_parent"
+        	    android:layout_height="fill_parent"
+        	    android:layout_above="@+id/version"
+        	    android:scrollbars="vertical"
+        	    android:textSize="7dp"
+        	    android:typeface="monospace" />
+        
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="fill_parent"
+                android:layout_height="10dip"
+                android:layout_alignParentBottom="true"
+                android:gravity="bottom|right"
+                android:textSize="7dp"
+                android:typeface="monospace" />
+
+        </RelativeLayout>
 
     </RelativeLayout>
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);
-- 
cgit v1.2.3