projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Just use GPS location provider to build on 4.2
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TabPad.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 8b3c401290055006cd7332652265b3d7e09d470e..066c1353ef792a87896a18a3522d9623725a0e2d 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@
-122,15
+122,15
@@
public class TabPad extends Fragment implements AltosDroidTab {
} else {
mDataLoggingView.setText("Storage full");
}
} else {
mDataLoggingView.setText("Storage full");
}
- mDataLoggingLights.set(state.data.flight != 0, state.data.flight
!
= AltosRecord.MISSING);
+ mDataLoggingLights.set(state.data.flight != 0, state.data.flight
=
= AltosRecord.MISSING);
if (state.gps != null) {
if (state.gps != null) {
- mGPSLockedView.setText(AltosDroid.
numb
er("%4d sats", state.gps.nsat));
+ mGPSLockedView.setText(AltosDroid.
integ
er("%4d sats", state.gps.nsat));
mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
if (state.gps_ready)
mGPSReadyView.setText("Ready");
else
mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
if (state.gps_ready)
mGPSReadyView.setText("Ready");
else
- mGPSReadyView.setText(AltosDroid.
numb
er("Waiting %d", state.gps_waiting));
+ mGPSReadyView.setText(AltosDroid.
integ
er("Waiting %d", state.gps_waiting));
} else
mGPSLockedLights.set(false, true);
mGPSReadyLights.set(state.gps_ready, state.gps == null);
} else
mGPSLockedLights.set(false, true);
mGPSReadyLights.set(state.gps_ready, state.gps == null);