Merge to head (non-trivial merge)

This commit is contained in:
Rodrigo Damazio
2011-06-14 20:42:57 -03:00
17 changed files with 227 additions and 99 deletions
@@ -145,6 +145,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
dataHub = TrackDataHub.getStartedInstance();
dataHub.registerTrackDataListener(this, EnumSet.of(
ListenerDataType.SELECTED_TRACK_CHANGED,
ListenerDataType.TRACK_UPDATES,
ListenerDataType.POINT_UPDATES,
ListenerDataType.SAMPLED_OUT_POINT_UPDATES,
ListenerDataType.WAYPOINT_UPDATES,