projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Class of offline map view widget changed
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosDroid.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index c2a6cb29a972a142b425ccf34eabd39292b3adcf..b87b51b58fd98f9bcc3aab2385c0eab31de62cee 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@
-466,8
+466,8
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
for (AltosDroidTab mTab : mTabs)
mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem());
for (AltosDroidTab mTab : mTabs)
mTab.update_ui(telem_state, state, from_receiver, location, mTab == mTabsAdapter.currentItem());
- if (
state != null &&
mAltosVoice != null)
- mAltosVoice.tell(
state, from_receiver
);
+ if (mAltosVoice != null)
+ mAltosVoice.tell(
telem_state, state, from_receiver, location, (AltosDroidTab) mTabsAdapter.currentItem()
);
saved_state = state;
}
saved_state = state;
}
@@
-998,6
+998,12
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
static String direction(AltosGreatCircle from_receiver,
Location receiver) {
static String direction(AltosGreatCircle from_receiver,
Location receiver) {
+ if (from_receiver == null)
+ return null;
+
+ if (receiver == null)
+ return null;
+
if (!receiver.hasBearing())
return null;
if (!receiver.hasBearing())
return null;
@@
-1016,8
+1022,8
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
else if (iheading < -179 || 179 < iheading)
return "backwards";
else if (iheading < 0)
else if (iheading < -179 || 179 < iheading)
return "backwards";
else if (iheading < 0)
- return String.format("left %d", -iheading);
+ return String.format("left %d
°
", -iheading);
else
else
- return String.format("right %d", iheading);
+ return String.format("right %d
°
", iheading);
}
}
}
}