summaryrefslogtreecommitdiff
path: root/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2014-09-06 13:41:36 -0600
committerBdale Garbee <bdale@gag.com>2014-09-06 13:41:36 -0600
commit8c212cd5bfa03f71a31d84bd0051314e77d88461 (patch)
tree5be036b3510b8b474ad829caea20fcbc75b56839 /altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
parente9714e34091abe657aa1b30aeda9466331aa39c1 (diff)
parentdd26ec2e706bdd29090759deeb90090a0e3b74f0 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts: ao-bringup/turnon_telemega
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 811e5482..ab338ac2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -158,7 +158,7 @@ public class TabMap extends AltosDroidTab {
public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
if (from_receiver != null) {
mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
- mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+ set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
}
if (state != null) {