Merge heads

MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.apps.mytracks;
 
-import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.services.RemoveTempFilesService;
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
@@ -26,13 +25,11 @@ import android.content.Intent;
 
 /**
  * MyTracksApplication for keeping global state.
- *
+ * 
  * @author Jimmy Shih
  */
 public class MyTracksApplication extends Application {
 
-  private TrackDataHub trackDataHub;
-
   @Override
   public void onCreate() {
     super.onCreate();
@@ -43,16 +40,4 @@ public class MyTracksApplication extends Application {
     Intent intent = new Intent(this, RemoveTempFilesService.class);
     startService(intent);
   }
-
-  /**
-   * Gets the application's TrackDataHub.
-   * 
-   * Note: use synchronized to make sure only one instance is created per application.
-   */
-  public synchronized TrackDataHub getTrackDataHub() {
-    if (trackDataHub == null) {
-      trackDataHub = TrackDataHub.newInstance(getApplicationContext());
-    }
-    return trackDataHub;
-  }
 }

MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -137,8 +137,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE)
         .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
-    trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
-    trackDataHub.loadTrack(trackId);
+    trackDataHub = TrackDataHub.newInstance(this);
 
     mapViewContainer = getLayoutInflater().inflate(R.layout.map, null);
     ApiAdapterFactory.getApiAdapter().disableHardwareAccelerated(mapViewContainer);
@@ -167,7 +166,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   public void onNewIntent(Intent intent) {
     setIntent(intent);
     handleIntent(intent);
-    trackDataHub.loadTrack(trackId);
     showMarker();
   }
 
@@ -180,6 +178,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   @Override
   protected void onResume() {
     super.onResume();
+    trackDataHub.loadTrack(trackId);
     TrackRecordingServiceConnectionUtils.resume(this, trackRecordingServiceConnection);
     setTitle(trackId == PreferencesUtils.getLong(this, R.string.recording_track_id_key));
   }
@@ -350,12 +349,19 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   }
 
   /**
-   * @return the mapViewContainer
+   * Gets the map view container.
    */
   public View getMapViewContainer() {
     return mapViewContainer;
   }
 
+  /**
+   * Gets the {@link TrackDataHub}.
+   */
+  public TrackDataHub getTrackDataHub() {
+    return trackDataHub;
+  }
+
   /**
    * Handles the data in the intent.
    */

MyTracks/src/com/google/android/apps/mytracks/content/DataSource.java

@@ -149,25 +149,25 @@ public class DataSource {
   }
 
   /**
-   * Registers a compass listener.
+   * Registers a heading listener.
    * 
    * @param listener the listener
    */
-  public void registerCompassListener(SensorEventListener listener) {
-    Sensor compass = sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
-    if (compass == null) {
-      Log.d(TAG, "No compass sensor.");
+  public void registerHeadingListener(SensorEventListener listener) {
+    Sensor heading = sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
+    if (heading == null) {
+      Log.d(TAG, "No heading sensor.");
       return;
     }
-    sensorManager.registerListener(listener, compass, SensorManager.SENSOR_DELAY_UI);
+    sensorManager.registerListener(listener, heading, SensorManager.SENSOR_DELAY_UI);
   }
 
   /**
-   * Unregisters a compass listener.
+   * Unregisters a heading listener.
    * 
    * @param listener the listener
    */
-  public void unregisterCompassListener(SensorEventListener listener) {
+  public void unregisterHeadingListener(SensorEventListener listener) {
     sensorManager.unregisterListener(listener);
   }
 

MyTracks/src/com/google/android/apps/mytracks/content/DataSourceManager.java

@@ -133,11 +133,11 @@ public class DataSourceManager {
   }
 
   /**
-   * Listener for compass changes.
+   * Listener for heading changes.
    * 
    * @author Jimmy Shih
    */
-  private class CompassListener implements SensorEventListener {
+  private class HeadingListener implements SensorEventListener {
 
     @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
@@ -174,7 +174,7 @@ public class DataSourceManager {
   private final WaypointsTableObserver waypointsTableObserver;
   private final TrackPointsTableObserver trackPointsTableObserver;
   private final CurrentLocationListener currentLocationListener;
-  private final CompassListener compassListener;
+  private final HeadingListener headingListener;
   private final PreferenceListener preferenceListener;
 
   public DataSourceManager(DataSource dataSource, DataSourceListener dataSourceListener) {
@@ -186,7 +186,7 @@ public class DataSourceManager {
     waypointsTableObserver = new WaypointsTableObserver();
     trackPointsTableObserver = new TrackPointsTableObserver();
     currentLocationListener = new CurrentLocationListener();
-    compassListener = new CompassListener();
+    headingListener = new HeadingListener();
     preferenceListener = new PreferenceListener();
   }
 
@@ -202,9 +202,9 @@ public class DataSourceManager {
      * Map SAMPLED_OUT_POINT_UPDATES to POINT_UPDATES since they correspond to
      * the same internal listener
      */
-    if (neededListeners.contains(TrackDataType.SAMPLED_OUT_TRACK_POINTS)) {
-      neededListeners.remove(TrackDataType.SAMPLED_OUT_TRACK_POINTS);
-      neededListeners.add(TrackDataType.TRACK_POINTS_TABLE);
+    if (neededListeners.contains(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE)) {
+      neededListeners.remove(TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE);
+      neededListeners.add(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE);
     }
 
     Log.d(TAG, "Updating listeners " + neededListeners);
@@ -248,18 +248,18 @@ public class DataSourceManager {
       case WAYPOINTS_TABLE:
         dataSource.registerContentObserver(WaypointsColumns.CONTENT_URI, waypointsTableObserver);
         break;
-      case TRACK_POINTS_TABLE:
+      case SAMPLED_IN_TRACK_POINTS_TABLE:
         dataSource.registerContentObserver(
             TrackPointsColumns.CONTENT_URI, trackPointsTableObserver);
         break;
-      case SAMPLED_OUT_TRACK_POINTS:
+      case SAMPLED_OUT_TRACK_POINTS_TABLE:
         // Do nothing. SAMPLED_OUT_POINT_UPDATES is mapped to POINT_UPDATES.
         break;
       case LOCATION:
         dataSource.registerLocationListener(currentLocationListener);
         break;
-      case COMPASS:
-        dataSource.registerCompassListener(compassListener);
+      case HEADING:
+        dataSource.registerHeadingListener(headingListener);
         break;
       case PREFERENCE:
         dataSource.registerOnSharedPreferenceChangeListener(preferenceListener);
@@ -285,17 +285,17 @@ public class DataSourceManager {
       case WAYPOINTS_TABLE:
         dataSource.unregisterContentObserver(waypointsTableObserver);
         break;
-      case TRACK_POINTS_TABLE:
+      case SAMPLED_IN_TRACK_POINTS_TABLE:
         dataSource.unregisterContentObserver(trackPointsTableObserver);
         break;
-      case SAMPLED_OUT_TRACK_POINTS:
+      case SAMPLED_OUT_TRACK_POINTS_TABLE:
         // Do nothing. SAMPLED_OUT_POINT_UPDATES is mapped to POINT_UPDATES.
         break;
       case LOCATION:
         dataSource.unregisterLocationListener(currentLocationListener);
         break;
-      case COMPASS:
-        dataSource.unregisterCompassListener(compassListener);
+      case HEADING:
+        dataSource.unregisterHeadingListener(headingListener);
         break;
       case PREFERENCE:
         dataSource.unregisterOnSharedPreferenceChangeListener(preferenceListener);

MyTracks/src/com/google/android/apps/mytracks/content/ListenerState.java

@@ -1,105 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.android.apps.mytracks.content;
-
-import java.util.EnumSet;
-
-/**
- * State for a registered {@link TrackDataListener}.
- * 
- * @author Jimmy Shih
- */
-public class ListenerState {
-  
-  private TrackDataListener trackDataListener;
-  private EnumSet<TrackDataType> trackDataTypes;
-
-  private long lastTrackId;
-  private long lastPointId;
-  private int lastSamplingFrequency;
-  private int numberOfLoadedPoints;
-
-  public ListenerState(
-      TrackDataListener trackDataListener, EnumSet<TrackDataType> trackDataTypes) {
-    this.trackDataListener = trackDataListener;
-    this.trackDataTypes = trackDataTypes;
-  }
-
-  /**
-   * Gets the {@link TrackDataListener}.
-   */
-  public TrackDataListener getTrackDataListener() {
-    return trackDataListener;
-  }
-
-  /**
-   * Gets the track data types.
-   */
-  public EnumSet<TrackDataType> getTrackDataTypes() {
-    return trackDataTypes;
-  }
-
-  /**
-   * Gets the last track id.
-   */
-  public long getLastTrackId() {
-    return lastTrackId;
-  }
-
-  /**
-   * Gets the last point id.
-   */
-  public long getLastPointId() {
-    return lastPointId;
-  }
-
-  /**
-   * Gets the last sampling frequency.
-   */
-  public int getLastSamplingFrequency() {
-    return lastSamplingFrequency;
-  }
-
-  /**
-   * Get the number of loaded points.
-   */
-  public int getNumberOfLoadedPoints() {
-    return numberOfLoadedPoints;
-  }
-
-  /**
-   * Sets the listener state.
-   * 
-   * @param trackId track id
-   * @param pointId point id
-   * @param samplingFrequency sampling frequency
-   * @param loadedPoints number of loaded points
-   */
-  public void setState(long trackId, long pointId, int samplingFrequency, int loadedPoints) {
-    lastTrackId = trackId;
-    lastPointId = pointId;
-    lastSamplingFrequency = samplingFrequency;
-    numberOfLoadedPoints = loadedPoints;
-  }
-
-  /**
-   * Resets state.
-   */
-  public void resetState() {
-    setState(0L, 0L, 0, 0);
-  }
-}

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java

@@ -13,138 +13,131 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
 
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
+package com.google.android.apps.mytracks.content;
 
 import android.location.Location;
 
 /**
- * Listener for track data, for both initial and incremental loading.
- *
+ * Listener for track data changes.
+ * 
  * @author Rodrigo Damazio
  */
 public interface TrackDataListener {
 
-  /** States for the GPS location provider. */
-  public enum ProviderState {
-    DISABLED,
-    NO_FIX,
-    BAD_FIX,
-    GOOD_FIX;
+  /**
+   * Location state.
+   * 
+   * @author Jimmy Shih
+   */
+  public enum LocationState {
+    DISABLED, NO_FIX, BAD_FIX, GOOD_FIX;
   }
 
   /**
-   * Called when the location provider changes state.
+   * Called when the location state changes.
    */
-  void onProviderStateChange(ProviderState state);
+  public void onLocationStateChanged(LocationState locationState);
 
   /**
-   * Called when the current location changes.
-   * This is meant for immediate location display only - track point data is
-   * delivered by other methods below, such as {@link #onNewTrackPoint}.
-   *
-   * @param loc the last known location
-   */
-  void onCurrentLocationChanged(Location loc);
-
-  /**
-   * Called when the current heading changes.
-   *
-   * @param heading the current heading, already accounting magnetic declination
-   */
-  void onCurrentHeadingChanged(double heading);
-
-  /**
-   * Called when the currently-selected track changes.
-   * This will be followed by calls to data methods such as
-   * {@link #onTrackUpdated}, {@link #clearTrackPoints},
-   * {@link #onNewTrackPoint(Location)}, etc., even if no track is currently
-   * selected (in which case you'll only get calls to clear the current data).
+   * Called when the location changes. This is meant for location display only,
+   * track point data is reported with other methods like
+   * {@link #onSampledInTrackPoint(Location)} and
+   * {@link #onSampledOutTrackPoint(Location)}.
    * 
-   * @param track the selected track, or null if no track is selected
-   * @param isRecording whether we're currently recording the selected track
+   * @param location the location
    */
-  void onSelectedTrackChanged(Track track, boolean isRecording);
+  public void onLocationChanged(Location location);
 
   /**
-   * Called when the track and/or its statistics have been updated.
-   *
-   * @param track the updated version of the track
+   * Called when the heading changes.
+   * 
+   * @param heading the heading
    */
-  void onTrackUpdated(Track track);
+  public void onHeadingChanged(double heading);
 
   /**
-   * Called to clear any previously-sent track points.
-   * This can be called at any time that we decide the data needs to be
-   * reloaded, such as when it needs to be resampled.
+   * Called when the selected track changes. This will be followed by calls to
+   * data methods such as {@link #onTrackUpdated(Track)},
+   * {@link #clearTrackPoints()}, {@link #onSampledInTrackPoint(Location)},
+   * etc., even if no track is currently selected (in which case you'll only get
+   * calls to clear the current data).
+   * 
+   * @param track the selected track or null if no track is selected
+   * @param isRecording true if the selected track is recording
    */
-  void clearTrackPoints();
+  public void onSelectedTrackChanged(Track track, boolean isRecording);
 
   /**
-   * Called when a new interesting track point is read.
-   * In this case, interesting means that the point has already undergone
-   * sampling and invalid point filtering.
-   *
-   * @param loc the new track point
+   * Called when the track or its statistics has been updated.
+   * 
+   * @param track the track
    */
-  void onNewTrackPoint(Location loc);
+  public void onTrackUpdated(Track track);
 
   /**
-   * Called when a uninteresting track point is read.
-   * Uninteresting points are all points that get sampled out of the track.
-   *
-   * @param loc the new track point
+   * Called to clear previously-sent track points.
    */
-  void onSampledOutTrackPoint(Location loc);
+  public void clearTrackPoints();
 
   /**
-   * Called when an invalid point (representing a segment split) is read.
+   * Called when a sampled in track point is read.
+   * 
+   * @param location the location
    */
-  void onSegmentSplit();
+  public void onSampledInTrackPoint(Location location);
 
   /**
-   * Called when we're done (for the time being) sending new points.
-   * This gets called after every batch of calls to {@link #onNewTrackPoint},
-   * {@link #onSampledOutTrackPoint} and {@link #onSegmentSplit}.
+   * Called when a sampled out track point is read.
+   * 
+   * @param location the location
    */
-  void onNewTrackPointsDone();
+  public void onSampledOutTrackPoint(Location location);
 
   /**
-   * Called to clear any previously-sent waypoints.
-   * This can be called at any time that we decide the data needs to be
-   * reloaded.
+   * Called when an invalid track point representing a segment split is read.
    */
-  void clearWaypoints();
+  public void onSegmentSplit();
+
+  /**
+   * Called when finish sending new track points. This gets called after every
+   * batch of calls to {@link #onSampledInTrackPoint(Location)},
+   * {@link #onSampledOutTrackPoint(Location)} and {@link #onSegmentSplit()}.
+   */
+  public void onNewTrackPointsDone();
+
+  /**
+   * Called to clear previously sent waypoints.
+   */
+  public void clearWaypoints();
 
   /**
    * Called when a new waypoint is read.
-   *
-   * @param wpt the new waypoint
+   * 
+   * @param waypoint the waypoint
    */
-  void onNewWaypoint(Waypoint wpt);
+  public void onNewWaypoint(Waypoint waypoint);
 
   /**
-   * Called when we're done (for the time being) sending new waypoints.
-   * This gets called after every batch of calls to {@link #clearWaypoints} and
-   * {@link #onNewWaypoint}.
+   * Called when finish sending new waypoints. This gets called after every
+   * batch of calls to {@link #clearWaypoints()} and
+   * {@link #onNewWaypoint(Waypoint)}.
    */
-  void onNewWaypointsDone();
+  public void onNewWaypointsDone();
 
   /**
-   * Called when the display units are changed by the user.
-   *
-   * @param metric true if the units are metric, false if imperial
-   * @return true to reload all the data, false otherwise
+   * Called when the metric units preference value is change.
+   * 
+   * @param metricUnits true to use metric units, false to use imperial units
+   * @return true to reload all the data, false otherwise.
    */
-  boolean onUnitsChanged(boolean metric);
+  public boolean onMetricUnitsChanged(boolean metricUnits);
 
   /**
-   * Called when the speed/pace display unit is changed by the user.
-   *
-   * @param reportSpeed true to report speed, false for pace
-   * @return true to reload all the data, false otherwise
+   * Called when the report speed preference value is changed.
+   * 
+   * @param reportSpeed true to report speed, false to report pace
+   * @return true to reload all the data, false otherwise.
    */
-  boolean onReportSpeedChanged(boolean reportSpeed);
+  public boolean onReportSpeedChanged(boolean reportSpeed);
 }

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataManager.java

@@ -35,9 +35,9 @@ import java.util.Set;
  */
 public class TrackDataManager {
 
-  // Map of listener to its state
-  private final Map<TrackDataListener, ListenerState>
-      listenerToStateMap = new HashMap<TrackDataListener, ListenerState>();
+  // Map of listener to its track data types
+  private final Map<TrackDataListener, EnumSet<TrackDataType>>
+      listenerToTypesMap = new HashMap<TrackDataListener, EnumSet<TrackDataType>>();
 
   // Map of track data type to listeners
   private final Map<TrackDataType, Set<TrackDataListener>>
@@ -55,20 +55,15 @@ public class TrackDataManager {
    * @param listener the listener
    * @param trackDataTypes the track data types the listener is interested
    */
-  public ListenerState registerListener(
+  public void registerListener(
       TrackDataListener listener, EnumSet<TrackDataType> trackDataTypes) {
-    if (listenerToStateMap.containsKey(listener)) {
+    if (listenerToTypesMap.containsKey(listener)) {
       throw new IllegalStateException("Listener is already registered");
     }
-
-    ListenerState listenerState = new ListenerState(listener, trackDataTypes);
-    listenerToStateMap.put(listener, listenerState);
-
+    listenerToTypesMap.put(listener, trackDataTypes);
     for (TrackDataType trackDataType : trackDataTypes) {
       typeToListenersMap.get(trackDataType).add(listener);
     }
-
-    return listenerState;
   }
 
   /**
@@ -77,14 +72,14 @@ public class TrackDataManager {
    * @param listener the listener
    */
   public void unregisterListener(TrackDataListener listener) {
-    ListenerState removed = listenerToStateMap.remove(listener);
-    if (removed == null) {
+    EnumSet<TrackDataType> removedTypes = listenerToTypesMap.remove(listener);
+    if (removedTypes == null) {
       Log.w(TAG, "Tried to unregister a listener that is not registered.");
       return;
     }
 
     // Remove the listener from the typeToListenersMap
-    for (TrackDataType trackDataType : removed.getTrackDataTypes()) {
+    for (TrackDataType trackDataType : removedTypes) {
       typeToListenersMap.get(trackDataType).remove(listener);
     }
   }
@@ -93,16 +88,16 @@ public class TrackDataManager {
    * Gets the number of {@link TrackDataListener}.
    */
   public int getNumberOfListeners() {
-    return listenerToStateMap.size();
+    return listenerToTypesMap.size();
   }
 
   /**
-   * Gets the track listener state.
+   * Gets the track data types for a listener.
    * 
    * @param listener the listener
    */
-  public ListenerState getListenerState(TrackDataListener listener) {
-    return listenerToStateMap.get(listener);
+  public EnumSet<TrackDataType> getTrackDataTypes(TrackDataListener listener) {
+    return listenerToTypesMap.get(listener);
   }
 
   /**
@@ -119,9 +114,11 @@ public class TrackDataManager {
    */
   public EnumSet<TrackDataType> getRegisteredTrackDataTypes() {
     EnumSet<TrackDataType> types = EnumSet.noneOf(TrackDataType.class);
-    for (ListenerState registration : this.listenerToStateMap.values()) {
-      types.addAll(registration.getTrackDataTypes());
+    for (EnumSet<TrackDataType> value : listenerToTypesMap.values()) {
+      types.addAll(value);
     }
+    // Always include preference
+    types.add(TrackDataType.PREFERENCE);
     return types;
   }
 }

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataType.java

@@ -22,13 +22,12 @@ package com.google.android.apps.mytracks.content;
  * @author Jimmy Shih
  */
 public enum TrackDataType {
-
   SELECTED_TRACK, // selected track changes
   TRACKS_TABLE, // tracks table changes
   WAYPOINTS_TABLE, // waypoints table changes
-  TRACK_POINTS_TABLE, // track points table changes
-  SAMPLED_OUT_TRACK_POINTS, // sampled-out track points changes
+  SAMPLED_IN_TRACK_POINTS_TABLE, // sampled-in track points table changes
+  SAMPLED_OUT_TRACK_POINTS_TABLE, // sampled-out track points table changes
   LOCATION, // location changes
-  COMPASS, // compass changes
-  PREFERENCE; // preference changes
+  HEADING, // heading changes
+  PREFERENCE // preference changes
 }

MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java

@@ -18,14 +18,14 @@ package com.google.android.apps.mytracks.fragments;
 
 import com.google.android.apps.mytracks.ChartView;
 import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.MyTracksApplication;
-import com.google.android.apps.mytracks.content.TrackDataType;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.TrackDataListener;
+import com.google.android.apps.mytracks.content.TrackDataType;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
@@ -96,7 +96,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
 
       zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
       zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-      chartView.setShowPointer(isRecording());
+      chartView.setShowPointer(isSelectedTrackRecording());
       chartView.invalidate();
     }
   };
@@ -164,17 +164,17 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onProviderStateChange(ProviderState state) {
+  public void onLocationStateChanged(LocationState state) {
     // We don't care.
   }
 
   @Override
-  public void onCurrentLocationChanged(Location loc) {
+  public void onLocationChanged(Location loc) {
     // We don't care.
   }
 
   @Override
-  public void onCurrentHeadingChanged(double heading) {
+  public void onHeadingChanged(double heading) {
     // We don't care.
   }
 
@@ -213,7 +213,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onNewTrackPoint(Location location) {
+  public void onSampledInTrackPoint(Location location) {
     if (LocationUtils.isValidLocation(location)) {
       double[] data = new double[ChartView.NUM_SERIES + 1];
       fillDataPoint(location, data);
@@ -259,7 +259,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public boolean onUnitsChanged(boolean metric) {
+  public boolean onMetricUnitsChanged(boolean metric) {
     if (metricUnits == metric) {
       return false;
     }
@@ -358,13 +358,13 @@ public class ChartFragment extends Fragment implements TrackDataListener {
    * accessed by multiple threads.
    */
   private synchronized void resumeTrackDataHub() {
-    trackDataHub = ((MyTracksApplication) getActivity().getApplication()).getTrackDataHub();
+    trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
     trackDataHub.registerTrackDataListener(this, EnumSet.of(
         TrackDataType.SELECTED_TRACK,
         TrackDataType.TRACKS_TABLE,
         TrackDataType.WAYPOINTS_TABLE,
-        TrackDataType.TRACK_POINTS_TABLE,
-        TrackDataType.SAMPLED_OUT_TRACK_POINTS,
+        TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE,
+        TrackDataType.SAMPLED_OUT_TRACK_POINTS_TABLE,
         TrackDataType.PREFERENCE));
   }
 
@@ -378,11 +378,11 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
 
   /**
-   * Returns true if recording. Needs to be synchronized because trackDataHub
-   * can be accessed by multiple threads.
+   * Returns true if the selected track is recording. Needs to be synchronized
+   * because trackDataHub can be accessed by multiple threads.
    */
-  private synchronized boolean isRecording() {
-    return trackDataHub != null && trackDataHub.isRecordingSelected();
+  private synchronized boolean isSelectedTrackRecording() {
+    return trackDataHub != null && trackDataHub.isSelectedTrackRecording();
   }
 
   /**

MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java

@@ -17,14 +17,13 @@
 package com.google.android.apps.mytracks.fragments;
 
 import com.google.android.apps.mytracks.MapOverlay;
-import com.google.android.apps.mytracks.MyTracksApplication;
 import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.content.TrackDataType;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.TrackDataListener;
+import com.google.android.apps.mytracks.content.TrackDataType;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
@@ -271,7 +270,7 @@ public class MapFragment extends Fragment
   }
 
   @Override
-  public void onProviderStateChange(ProviderState state) {
+  public void onLocationStateChanged(LocationState state) {
     final int messageId;
     final boolean isGpsDisabled;
     switch (state) {
@@ -315,13 +314,13 @@ public class MapFragment extends Fragment
   }
 
   @Override
-  public void onCurrentLocationChanged(Location location) {
+  public void onLocationChanged(Location location) {
     currentLocation = location;
     updateCurrentLocation();
   }
 
   @Override
-  public void onCurrentHeadingChanged(double heading) {
+  public void onHeadingChanged(double heading) {
     if (mapOverlay.setHeading((float) heading)) {
       mapView.postInvalidate();
     }
@@ -362,7 +361,7 @@ public class MapFragment extends Fragment
   }
 
   @Override
-  public void onNewTrackPoint(Location location) {
+  public void onSampledInTrackPoint(Location location) {
     if (LocationUtils.isValidLocation(location)) {
       mapOverlay.addLocation(location);
     }
@@ -402,7 +401,7 @@ public class MapFragment extends Fragment
   }
 
   @Override
-  public boolean onUnitsChanged(boolean metric) {
+  public boolean onMetricUnitsChanged(boolean metric) {
     // We don't care.
     return false;
   }
@@ -418,13 +417,13 @@ public class MapFragment extends Fragment
    * accessed by multiple threads.
    */
   private synchronized void resumeTrackDataHub() {
-    trackDataHub = ((MyTracksApplication) getActivity().getApplication()).getTrackDataHub();
+    trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
     trackDataHub.registerTrackDataListener(this, EnumSet.of(
         TrackDataType.SELECTED_TRACK,
         TrackDataType.WAYPOINTS_TABLE,
-        TrackDataType.TRACK_POINTS_TABLE,
+        TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE,
         TrackDataType.LOCATION,
-        TrackDataType.COMPASS));
+        TrackDataType.HEADING));
   }
   
   /**

MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java

@@ -16,11 +16,11 @@
 
 package com.google.android.apps.mytracks.fragments;
 
-import com.google.android.apps.mytracks.MyTracksApplication;
-import com.google.android.apps.mytracks.content.TrackDataType;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.TrackDataListener;
+import com.google.android.apps.mytracks.content.TrackDataType;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
@@ -61,7 +61,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   // A runnable to update the total time field.
   private final Runnable updateTotalTime = new Runnable() {
     public void run() {
-      if (isRecording()) {
+      if (isSelectedTrackRecording()) {
         StatsUtils.setTotalTimeValue(getActivity(), System.currentTimeMillis() - startTime);
       }
     }
@@ -117,8 +117,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onProviderStateChange(ProviderState state) {
-    if (isResumed() && (state == ProviderState.DISABLED || state == ProviderState.NO_FIX)) {
+  public void onLocationStateChanged(LocationState state) {
+    if (isResumed() && (state == LocationState.DISABLED || state == LocationState.NO_FIX)) {
       getActivity().runOnUiThread(new Runnable() {
           @Override
         public void run() {
@@ -130,8 +130,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onCurrentLocationChanged(final Location location) {
-    if (isResumed() && isRecording()) {
+  public void onLocationChanged(final Location location) {
+    if (isResumed() && isSelectedTrackRecording()) {
       getActivity().runOnUiThread(new Runnable() {
         @Override
         public void run() {
@@ -143,7 +143,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onCurrentHeadingChanged(double heading) {
+  public void onHeadingChanged(double heading) {
     // We don't care.
   }
 
@@ -175,7 +175,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
           lastTripStatistics = track.getTripStatistics();
           
           startTime = track.getTripStatistics().getStartTime();
-          if (!isRecording()) {
+          if (!isSelectedTrackRecording()) {
             lastLocation = null;
           }
           updateUi();
@@ -190,7 +190,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public void onNewTrackPoint(Location loc) {
+  public void onSampledInTrackPoint(Location loc) {
     // We don't care.
   }
 
@@ -225,7 +225,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public boolean onUnitsChanged(final boolean metric) {
+  public boolean onMetricUnitsChanged(final boolean metric) {
     if (isResumed()) {
       getActivity().runOnUiThread(new Runnable() {
         @Override
@@ -255,7 +255,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    * be accessed by multiple threads.
    */
   private synchronized void resumeTrackDataHub() {
-    trackDataHub = ((MyTracksApplication) getActivity().getApplication()).getTrackDataHub();
+    trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
     trackDataHub.registerTrackDataListener(this, EnumSet.of(
         TrackDataType.SELECTED_TRACK,
         TrackDataType.TRACKS_TABLE,
@@ -273,11 +273,11 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   /**
-   * Returns true if recording. Needs to be synchronized because trackDataHub
-   * can be accessed by multiple threads.
+   * Returns true if the selected track is recording. Needs to be synchronized
+   * because trackDataHub can be accessed by multiple threads.
    */
-  private synchronized boolean isRecording() {
-    return trackDataHub != null && trackDataHub.isRecordingSelected();
+  private synchronized boolean isSelectedTrackRecording() {
+    return trackDataHub != null && trackDataHub.isSelectedTrackRecording();
   }
 
   /**

MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java

@@ -824,7 +824,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
       throw new IllegalArgumentException("locationFactory is null");
     }
     return new LocationIterator() {
-      private long lastTrackPointId = startTrackPointId;
+      private long lastTrackPointId = -1L;
       private Cursor cursor = getCursor(startTrackPointId);
       private final CachedTrackPointsIndexes
           indexes = cursor != null ? new CachedTrackPointsIndexes(cursor)
@@ -843,7 +843,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
        * Advances the cursor to the next batch. Returns true if successful.
        */
       private boolean advanceCursorToNextBatch() {
-        long trackPointId = lastTrackPointId + (descending ? -1 : 1);
+        long trackPointId = lastTrackPointId == -1L ? -1L : lastTrackPointId + (descending ? -1
+            : 1);
         Log.d(TAG, "Advancing track point id: " + trackPointId);
         cursor.close();
         cursor = getCursor(trackPointId);