Add a class EndToEndTestRunner which extends InstrumentationTestRunner and can get the port of emulator. Then test can be run on more than one emulators at the same time.

2026-10-08 04:13:06 +02:00 · 2012-08-01 17:25:21 +08:00
commit 8796318335
690 changed files with 64632 additions and 0 deletions
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010 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;
+
+/**
+ * Utilities for serializing primitive types.
+ * 
+ * @author Rodrigo Damazio
+ */
+public class ContentTypeIds {
+
+  private ContentTypeIds() {}
+
+  public static final byte BOOLEAN_TYPE_ID = 0;
+  public static final byte LONG_TYPE_ID = 1;
+  public static final byte INT_TYPE_ID = 2;
+  public static final byte FLOAT_TYPE_ID = 3;
+  public static final byte DOUBLE_TYPE_ID = 4;
+  public static final byte STRING_TYPE_ID = 5;
+  public static final byte BLOB_TYPE_ID = 6;
+}
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010 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.Vector;
+
+/**
+ * An interface for an object that can generate descriptions of track and
+ * waypoint.
+ *
+ * @author Sandor Dornbush
+ */
+public interface DescriptionGenerator {
+
+  /**
+   * Generates a track description.
+   *
+   * @param track the track
+   * @param distances a vector of distances to generate the elevation chart
+   * @param elevations a vector of elevations to generate the elevation chart
+   * @param html true to output html, false to output plain text
+   */
+  public String generateTrackDescription(
+      Track track, Vector<Double> distances, Vector<Double> elevations, boolean html);
+
+  /**
+   * Generate a waypoint description.
+   *
+   * @param waypoint the waypoint
+   */
+  public String generateWaypointDescription(Waypoint waypoint);
+}
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 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 com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
+
+import android.location.Location;
+
+/**
+ * This class extends the standard Android location with extra information.
+ *
+ * @author Sandor Dornbush
+ */
+public class MyTracksLocation extends Location {
+
+  private SensorDataSet sensorDataSet = null;
+
+  /**
+   * The id of this location from the provider.
+   */
+  private int id = -1;
+
+  public MyTracksLocation(Location location, Sensor.SensorDataSet sd) {
+    super(location);
+    this.sensorDataSet = sd;
+  }
+
+  public MyTracksLocation(String provider) {
+    super(provider);
+  }
+
+  public SensorDataSet getSensorDataSet() {
+    return sensorDataSet;
+  }
+
+  public void setSensorDataSet(SensorDataSet sensorDataSet) {
+    this.sensorDataSet = sensorDataSet;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+  
+  public void reset() {
+    super.reset();
+    sensorDataSet = null;
+    id = -1;
+  }
+}
@@ -0,0 +1,428 @@
+/*
+ * Copyright 2010 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 android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.location.Location;
+import android.location.LocationManager;
+import android.net.Uri;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Utilities to access data from the My Tracks content provider.
+ * 
+ * @author Rodrigo Damazio
+ */
+public interface MyTracksProviderUtils {
+
+  /**
+   * The authority (the first part of the URI) for the My Tracks content
+   * provider.
+   */
+  public static final String AUTHORITY = "com.google.android.maps.mytracks";
+
+  /**
+   * Gets a track cursor. The caller owns the returned cursor and is responsible
+   * for closing it.
+   * 
+   * @param selection the selection
+   * @param selectionArgs the selection arguments
+   * @param sortOrder the sort order
+   */
+  public Cursor getTracksCursor(String selection, String[] selectionArgs, String sortOrder);
+
+  /**
+   * Gets all the tracks. If no track exists, an empty list is returned.
+   * <p>
+   * Note that the returned tracks do not have any track points attached.
+   */
+  public List<Track> getAllTracks();
+
+  /**
+   * Gets a track by a track id. Returns null if not found.
+   * <p>
+   * Note that the returned track doesn't have any track points attached.
+   * 
+   * @param trackId the track id.
+   */
+  public Track getTrack(long trackId);
+
+  /**
+   * Gets the last track. Returns null if doesn't exist.
+   */
+  public Track getLastTrack();
+
+  /**
+   * Gets the last track id. Returns -1L if doesn't exist.
+   */
+  public long getLastTrackId();
+
+  /**
+   * Returns true if a track exists.
+   * 
+   * @param trackId the track id
+   */
+  public boolean trackExists(long trackId);
+
+  /**
+   * Inserts a track.
+   * <p>
+   * Note: This doesn't insert any track points.
+   * 
+   * @param track the track
+   * @return the content provider URI of the inserted track.
+   */
+  public Uri insertTrack(Track track);
+
+  /**
+   * Updates a track.
+   * <p>
+   * Note: This doesn't update any track points.
+   * 
+   * @param track the track
+   */
+  public void updateTrack(Track track);
+
+  /**
+   * Deletes all tracks (including waypoints and track points).
+   */
+  public void deleteAllTracks();
+
+  /**
+   * Deletes a track.
+   * 
+   * @param trackId the track id
+   */
+  public void deleteTrack(long trackId);
+
+  /**
+   * Creates a {@link Track} from a cursor.
+   * 
+   * @param cursor the cursor pointing to the track
+   */
+  public Track createTrack(Cursor cursor);
+
+  /**
+   * Creates a {@link ContentValues} from a track.
+   * 
+   * @param track the track
+   */
+  public ContentValues createContentValues(Track track);
+
+  /**
+   * Gets a waypoint cursor. The caller owns the returned cursor and is
+   * responsible for closing it.
+   * 
+   * @param selection the selection
+   * @param selectionArgs the selection arguments
+   * @param sortOrder the sort order
+   * @param maxWaypoints the maximum number of waypoints to return
+   */
+  public Cursor getWaypointsCursor(
+      String selection, String[] selectionArgs, String sortOrder, int maxWaypoints);
+
+  /**
+   * Gets a waypoint cursor for a track. The caller owns the returned cursor and
+   * is responsible for closing it.
+   * 
+   * @param trackId the track id
+   * @param minWaypointId the minimum waypoint id
+   * @param maxWaypoints the maximum number of waypoints to return
+   */
+  public Cursor getWaypointsCursor(long trackId, long minWaypointId, int maxWaypoints);
+
+  /**
+   * Gets the first recorded waypoint for a track. The first waypoint is special
+   * as it contains the stats for the current segment. Returns null if it
+   * doesn't exist.
+   * 
+   * @param trackId the track id
+   */
+  public Waypoint getFirstWaypoint(long trackId);
+
+  /**
+   * Gets the first waypoint id for a track. The first waypoint is special as it
+   * contains the stats for the current segment. Returns -1L if it doesn't
+   * exist.
+   * 
+   * @param trackId the track id
+   */
+  public long getFirstWaypointId(long trackId);
+
+  /**
+   * Gets the last waypoint id for a track. Returns -1L if it doesn't exist.
+   * 
+   * @param trackId the track id
+   */
+  public long getLastWaypointId(long trackId);
+
+  /**
+   * Gets the next marker number. Returns -1 if not able to get the next marker
+   * number.
+   * 
+   * @param trackId the track id
+   * @param statistics true for statistics marker, false for waypoint marker
+   */
+  public int getNextMarkerNumber(long trackId, boolean statistics);
+
+  /**
+   * Gets the next statistics waypoint after the given waypoint. Returns null if
+   * it doesn't exists.
+   * 
+   * @param waypoint the given waypoint
+   */
+  public Waypoint getNextStatisticsWaypointAfter(Waypoint waypoint);
+
+  /**
+   * Gets a waypoint from a waypoint id. Returns null if not found.
+   * 
+   * @param waypointId the waypoint id
+   */
+  public Waypoint getWaypoint(long waypointId);
+
+  /**
+   * Inserts a waypoint.
+   * 
+   * @param waypoint the waypoint
+   * @return the content provider URI of the inserted waypoint.
+   */
+  public Uri insertWaypoint(Waypoint waypoint);
+
+  /**
+   * Updates a waypoint. Returns true if successful.
+   * 
+   * @param waypoint the waypoint
+   */
+  public boolean updateWaypoint(Waypoint waypoint);
+
+  /**
+   * Deletes a waypoint. If deleting a statistics waypoint, this will also
+   * correct the next statistics waypoint after the deleted one to reflect the
+   * deletion. The generator is used to update the next statistics waypoint.
+   * 
+   * @param waypointId the waypoint id
+   * @param descriptionGenerator the description generator
+   */
+  public void deleteWaypoint(long waypointId, DescriptionGenerator descriptionGenerator);
+
+  /**
+   * Creates a waypoint from a cursor.
+   * 
+   * @param cursor the cursor pointing to the waypoint
+   */
+  public Waypoint createWaypoint(Cursor cursor);
+
+  /**
+   * Gets the first recorded location. Returns null if it doesn't exist.
+   */
+  public Location getFirstLocation();
+
+  /**
+   * Gets the last recorded location. Returns null if it doesn't exist.
+   */
+  public Location getLastLocation();
+
+  /**
+   * Gets a location by track point id. Returns null if not found.
+   * 
+   * @param trackPointId the track point id
+   */
+  public Location getLocation(long trackPointId);
+
+  /**
+   * Creates a location cursor. The caller owns the returned cursor and is
+   * responsible for closing it.
+   * 
+   * @param trackId the track id
+   * @param startTrackPointId the starting track point id
+   * @param maxLocations maximum number of locations to return
+   * @param descending true to sort the result in descending order (latest
+   *          location first)
+   */
+  public Cursor getLocationsCursor(
+      long trackId, long startTrackPointId, int maxLocations, boolean descending);
+
+  /**
+   * Creates a new read-only iterator over a given track's points. It provides a
+   * lightweight way of iterating over long tracks without failing due to the
+   * underlying cursor limitations. Since it's a read-only iterator,
+   * {@link Iterator#remove()} always throws
+   * {@link UnsupportedOperationException}. Each call to
+   * {@link LocationIterator#next()} may advance to the next DB record, and if
+   * so, the iterator calls {@link LocationFactory#createLocation()} and
+   * populates it with information retrieved from the record. When done with
+   * iteration, {@link LocationIterator#close()} must be called.
+   * 
+   * @param trackId the track id
+   * @param startTrackPointId the start track point id or -1L to start from the
+   *          first point
+   * @param descending true to sort the result in descending order (latest
+   *          location first)
+   * @param locationFactory the location factory
+   */
+  public LocationIterator getLocationIterator(
+      long trackId, long startTrackPointId, boolean descending, LocationFactory locationFactory);
+
+  /**
+   * Gets the last location id for a track. Returns -1L if it doesn't exist.
+   * 
+   * @param trackId the track id
+   */
+  public long getLastLocationId(long trackId);
+
+  /**
+   * Inserts a track point.
+   * 
+   * @param location the location
+   * @param trackId the track id
+   * @return the content provider URI of the inserted track point
+   */
+  public Uri insertTrackPoint(Location location, long trackId);
+
+  /**
+   * Inserts multiple track points.
+   * 
+   * @param locations an array of locations
+   * @param length the number of locations (from the beginning of the array) to
+   *          insert, or -1 for all of them
+   * @param trackId the track id
+   * @return the number of points inserted
+   */
+  public int bulkInsertTrackPoints(Location[] locations, int length, long trackId);
+
+  /**
+   * Fills a location from a cursor.
+   * 
+   * @param cursor the cursor pointing to the location
+   * @param location the location to be overwritten
+   */
+  public void fillLocation(Cursor cursor, Location location);
+
+  /**
+   * Creates a location object from a cursor.
+   * 
+   * @param cursor the cursor pointing to the location
+   */
+  public Location createLocation(Cursor cursor);
+
+  /**
+   * A lightweight wrapper around the original {@link Cursor} with a method to
+   * clean up.
+   */
+  public interface LocationIterator extends Iterator<Location> {
+
+    /**
+     * Gets the most recently retrieved track point id by {@link #next()}.
+     */
+    public long getLocationId();
+
+    /**
+     * Closes the iterator.
+     */
+    public void close();
+  }
+
+  /**
+   * A factory for creating new {@link Location}.
+   */
+  public interface LocationFactory {
+
+    /**
+     * Creates a new {@link Location}. An implementation can create new
+     * instances or reuse existing instances for optimization.
+     */
+    public Location createLocation();
+  }
+
+  /**
+   * The default {@link LocationFactory} which creates a location each time.
+   */
+  public LocationFactory DEFAULT_LOCATION_FACTORY = new LocationFactory() {
+      @Override
+    public Location createLocation() {
+      return new Location(LocationManager.GPS_PROVIDER);
+    }
+  };
+
+  /**
+   * A {@link LocationFactory} which uses two location instances (one for the
+   * current location and one for the previous), useful when needing to keep the
+   * last location.
+   */
+  public class DoubleBufferedLocationFactory implements LocationFactory {
+
+    private final Location locations[] = new MyTracksLocation[] {
+        new MyTracksLocation(LocationManager.GPS_PROVIDER),
+        new MyTracksLocation(LocationManager.GPS_PROVIDER) };
+    private int lastLocation = 0;
+
+    @Override
+    public Location createLocation() {
+      lastLocation = (lastLocation + 1) % locations.length;
+      return locations[lastLocation];
+    }
+  }
+
+  /**
+   * A factory which can produce instances of {@link MyTracksProviderUtils}, and
+   * can be overridden for testing.
+   */
+  public static class Factory {
+
+    private static Factory instance = new Factory();
+
+    /**
+     * Creates an instance of {@link MyTracksProviderUtils}.
+     * 
+     * @param context the context
+     */
+    public static MyTracksProviderUtils get(Context context) {
+      return instance.newForContext(context);
+    }
+
+    /**
+     * Returns the factory instance.
+     */
+    public static Factory getInstance() {
+      return instance;
+    }
+
+    /**
+     * Overrides the factory instance for testing. Don't forget to set it back
+     * to the original value after testing.
+     * 
+     * @param factory the factory
+     */
+    public static void overrideInstance(Factory factory) {
+      instance = factory;
+    }
+
+    /**
+     * Creates an instance of {@link MyTracksProviderUtils}. Allows subclasses
+     * to override for testing.
+     * 
+     * @param context the context
+     */
+    protected MyTracksProviderUtils newForContext(Context context) {
+      return new MyTracksProviderUtilsImpl(context.getContentResolver());
+    }
+  }
+}
@@ -0,0 +1,883 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: proto/sensor.proto
+
+package com.google.android.apps.mytracks.content;
+
+public final class Sensor {
+  private Sensor() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+  public enum SensorState
+      implements com.google.protobuf.Internal.EnumLite {
+    NONE(0, 1),
+    CONNECTING(1, 2),
+    CONNECTED(2, 3),
+    DISCONNECTED(3, 4),
+    SENDING(4, 5),
+    ;
+    
+    
+    public final int getNumber() { return value; }
+    
+    public static SensorState valueOf(int value) {
+      switch (value) {
+        case 1: return NONE;
+        case 2: return CONNECTING;
+        case 3: return CONNECTED;
+        case 4: return DISCONNECTED;
+        case 5: return SENDING;
+        default: return null;
+      }
+    }
+    
+    public static com.google.protobuf.Internal.EnumLiteMap<SensorState>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static com.google.protobuf.Internal.EnumLiteMap<SensorState>
+        internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<SensorState>() {
+            public SensorState findValueByNumber(int number) {
+              return SensorState.valueOf(number)
+    ;        }
+          };
+    
+    private final int index;
+    private final int value;
+    private SensorState(int index, int value) {
+      this.index = index;
+      this.value = value;
+    }
+    
+    // @@protoc_insertion_point(enum_scope:com.google.android.apps.mytracks.content.SensorState)
+  }
+  
+  public static final class SensorData extends
+      com.google.protobuf.GeneratedMessageLite {
+    // Use SensorData.newBuilder() to construct.
+    private SensorData() {
+      initFields();
+    }
+    private SensorData(boolean noInit) {}
+    
+    private static final SensorData defaultInstance;
+    public static SensorData getDefaultInstance() {
+      return defaultInstance;
+    }
+    
+    public SensorData getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+    
+    // required .com.google.android.apps.mytracks.content.SensorState state = 1 [default = NONE];
+    public static final int STATE_FIELD_NUMBER = 1;
+    private boolean hasState;
+    private com.google.android.apps.mytracks.content.Sensor.SensorState state_;
+    public boolean hasState() { return hasState; }
+    public com.google.android.apps.mytracks.content.Sensor.SensorState getState() { return state_; }
+    
+    // optional int32 value = 2;
+    public static final int VALUE_FIELD_NUMBER = 2;
+    private boolean hasValue;
+    private int value_ = 0;
+    public boolean hasValue() { return hasValue; }
+    public int getValue() { return value_; }
+    
+    private void initFields() {
+      state_ = com.google.android.apps.mytracks.content.Sensor.SensorState.NONE;
+    }
+    public final boolean isInitialized() {
+      if (!hasState) return false;
+      return true;
+    }
+    
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (hasState()) {
+        output.writeEnum(1, getState().getNumber());
+      }
+      if (hasValue()) {
+        output.writeInt32(2, getValue());
+      }
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+    
+      size = 0;
+      if (hasState()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(1, getState().getNumber());
+      }
+      if (hasValue()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, getValue());
+      }
+      memoizedSerializedSize = size;
+      return size;
+    }
+    
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorData parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(com.google.android.apps.mytracks.content.Sensor.SensorData prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+    
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageLite.Builder<
+          com.google.android.apps.mytracks.content.Sensor.SensorData, Builder> {
+      private com.google.android.apps.mytracks.content.Sensor.SensorData result;
+      
+      // Construct using com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder()
+      private Builder() {}
+      
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new com.google.android.apps.mytracks.content.Sensor.SensorData();
+        return builder;
+      }
+      
+      protected com.google.android.apps.mytracks.content.Sensor.SensorData internalGetResult() {
+        return result;
+      }
+      
+      public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            "Cannot call clear() after build().");
+        }
+        result = new com.google.android.apps.mytracks.content.Sensor.SensorData();
+        return this;
+      }
+      
+      public Builder clone() {
+        return create().mergeFrom(result);
+      }
+      
+      public com.google.android.apps.mytracks.content.Sensor.SensorData getDefaultInstanceForType() {
+        return com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+      }
+      
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorData build() {
+        if (result != null && !isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return buildPartial();
+      }
+      
+      private com.google.android.apps.mytracks.content.Sensor.SensorData buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        if (!isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return buildPartial();
+      }
+      
+      public com.google.android.apps.mytracks.content.Sensor.SensorData buildPartial() {
+        if (result == null) {
+          throw new IllegalStateException(
+            "build() has already been called on this Builder.");
+        }
+        com.google.android.apps.mytracks.content.Sensor.SensorData returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public Builder mergeFrom(com.google.android.apps.mytracks.content.Sensor.SensorData other) {
+        if (other == com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance()) return this;
+        if (other.hasState()) {
+          setState(other.getState());
+        }
+        if (other.hasValue()) {
+          setValue(other.getValue());
+        }
+        return this;
+      }
+      
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              return this;
+            default: {
+              if (!parseUnknownField(input, extensionRegistry, tag)) {
+                return this;
+              }
+              break;
+            }
+            case 8: {
+              int rawValue = input.readEnum();
+              com.google.android.apps.mytracks.content.Sensor.SensorState value = com.google.android.apps.mytracks.content.Sensor.SensorState.valueOf(rawValue);
+              if (value != null) {
+                setState(value);
+              }
+              break;
+            }
+            case 16: {
+              setValue(input.readInt32());
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      // required .com.google.android.apps.mytracks.content.SensorState state = 1 [default = NONE];
+      public boolean hasState() {
+        return result.hasState();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorState getState() {
+        return result.getState();
+      }
+      public Builder setState(com.google.android.apps.mytracks.content.Sensor.SensorState value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        result.hasState = true;
+        result.state_ = value;
+        return this;
+      }
+      public Builder clearState() {
+        result.hasState = false;
+        result.state_ = com.google.android.apps.mytracks.content.Sensor.SensorState.NONE;
+        return this;
+      }
+      
+      // optional int32 value = 2;
+      public boolean hasValue() {
+        return result.hasValue();
+      }
+      public int getValue() {
+        return result.getValue();
+      }
+      public Builder setValue(int value) {
+        result.hasValue = true;
+        result.value_ = value;
+        return this;
+      }
+      public Builder clearValue() {
+        result.hasValue = false;
+        result.value_ = 0;
+        return this;
+      }
+      
+      // @@protoc_insertion_point(builder_scope:com.google.android.apps.mytracks.content.SensorData)
+    }
+    
+    static {
+      defaultInstance = new SensorData(true);
+      com.google.android.apps.mytracks.content.Sensor.internalForceInit();
+      defaultInstance.initFields();
+    }
+    
+    // @@protoc_insertion_point(class_scope:com.google.android.apps.mytracks.content.SensorData)
+  }
+  
+  public static final class SensorDataSet extends
+      com.google.protobuf.GeneratedMessageLite {
+    // Use SensorDataSet.newBuilder() to construct.
+    private SensorDataSet() {
+      initFields();
+    }
+    private SensorDataSet(boolean noInit) {}
+    
+    private static final SensorDataSet defaultInstance;
+    public static SensorDataSet getDefaultInstance() {
+      return defaultInstance;
+    }
+    
+    public SensorDataSet getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+    
+    // optional uint64 creation_time = 1 [default = 0];
+    public static final int CREATION_TIME_FIELD_NUMBER = 1;
+    private boolean hasCreationTime;
+    private long creationTime_ = 0L;
+    public boolean hasCreationTime() { return hasCreationTime; }
+    public long getCreationTime() { return creationTime_; }
+    
+    // optional .com.google.android.apps.mytracks.content.SensorData heart_rate = 2;
+    public static final int HEART_RATE_FIELD_NUMBER = 2;
+    private boolean hasHeartRate;
+    private com.google.android.apps.mytracks.content.Sensor.SensorData heartRate_;
+    public boolean hasHeartRate() { return hasHeartRate; }
+    public com.google.android.apps.mytracks.content.Sensor.SensorData getHeartRate() { return heartRate_; }
+    
+    // optional .com.google.android.apps.mytracks.content.SensorData cadence = 3;
+    public static final int CADENCE_FIELD_NUMBER = 3;
+    private boolean hasCadence;
+    private com.google.android.apps.mytracks.content.Sensor.SensorData cadence_;
+    public boolean hasCadence() { return hasCadence; }
+    public com.google.android.apps.mytracks.content.Sensor.SensorData getCadence() { return cadence_; }
+    
+    // optional .com.google.android.apps.mytracks.content.SensorData power = 4;
+    public static final int POWER_FIELD_NUMBER = 4;
+    private boolean hasPower;
+    private com.google.android.apps.mytracks.content.Sensor.SensorData power_;
+    public boolean hasPower() { return hasPower; }
+    public com.google.android.apps.mytracks.content.Sensor.SensorData getPower() { return power_; }
+    
+    // optional .com.google.android.apps.mytracks.content.SensorData battery_level = 5;
+    public static final int BATTERY_LEVEL_FIELD_NUMBER = 5;
+    private boolean hasBatteryLevel;
+    private com.google.android.apps.mytracks.content.Sensor.SensorData batteryLevel_;
+    public boolean hasBatteryLevel() { return hasBatteryLevel; }
+    public com.google.android.apps.mytracks.content.Sensor.SensorData getBatteryLevel() { return batteryLevel_; }
+    
+    private void initFields() {
+      heartRate_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+      cadence_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+      power_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+      batteryLevel_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+    }
+    public final boolean isInitialized() {
+      if (hasHeartRate()) {
+        if (!getHeartRate().isInitialized()) return false;
+      }
+      if (hasCadence()) {
+        if (!getCadence().isInitialized()) return false;
+      }
+      if (hasPower()) {
+        if (!getPower().isInitialized()) return false;
+      }
+      if (hasBatteryLevel()) {
+        if (!getBatteryLevel().isInitialized()) return false;
+      }
+      return true;
+    }
+    
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (hasCreationTime()) {
+        output.writeUInt64(1, getCreationTime());
+      }
+      if (hasHeartRate()) {
+        output.writeMessage(2, getHeartRate());
+      }
+      if (hasCadence()) {
+        output.writeMessage(3, getCadence());
+      }
+      if (hasPower()) {
+        output.writeMessage(4, getPower());
+      }
+      if (hasBatteryLevel()) {
+        output.writeMessage(5, getBatteryLevel());
+      }
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+    
+      size = 0;
+      if (hasCreationTime()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(1, getCreationTime());
+      }
+      if (hasHeartRate()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, getHeartRate());
+      }
+      if (hasCadence()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getCadence());
+      }
+      if (hasPower()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getPower());
+      }
+      if (hasBatteryLevel()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, getBatteryLevel());
+      }
+      memoizedSerializedSize = size;
+      return size;
+    }
+    
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static com.google.android.apps.mytracks.content.Sensor.SensorDataSet parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(com.google.android.apps.mytracks.content.Sensor.SensorDataSet prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+    
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageLite.Builder<
+          com.google.android.apps.mytracks.content.Sensor.SensorDataSet, Builder> {
+      private com.google.android.apps.mytracks.content.Sensor.SensorDataSet result;
+      
+      // Construct using com.google.android.apps.mytracks.content.Sensor.SensorDataSet.newBuilder()
+      private Builder() {}
+      
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new com.google.android.apps.mytracks.content.Sensor.SensorDataSet();
+        return builder;
+      }
+      
+      protected com.google.android.apps.mytracks.content.Sensor.SensorDataSet internalGetResult() {
+        return result;
+      }
+      
+      public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            "Cannot call clear() after build().");
+        }
+        result = new com.google.android.apps.mytracks.content.Sensor.SensorDataSet();
+        return this;
+      }
+      
+      public Builder clone() {
+        return create().mergeFrom(result);
+      }
+      
+      public com.google.android.apps.mytracks.content.Sensor.SensorDataSet getDefaultInstanceForType() {
+        return com.google.android.apps.mytracks.content.Sensor.SensorDataSet.getDefaultInstance();
+      }
+      
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorDataSet build() {
+        if (result != null && !isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return buildPartial();
+      }
+      
+      private com.google.android.apps.mytracks.content.Sensor.SensorDataSet buildParsed()
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        if (!isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return buildPartial();
+      }
+      
+      public com.google.android.apps.mytracks.content.Sensor.SensorDataSet buildPartial() {
+        if (result == null) {
+          throw new IllegalStateException(
+            "build() has already been called on this Builder.");
+        }
+        com.google.android.apps.mytracks.content.Sensor.SensorDataSet returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public Builder mergeFrom(com.google.android.apps.mytracks.content.Sensor.SensorDataSet other) {
+        if (other == com.google.android.apps.mytracks.content.Sensor.SensorDataSet.getDefaultInstance()) return this;
+        if (other.hasCreationTime()) {
+          setCreationTime(other.getCreationTime());
+        }
+        if (other.hasHeartRate()) {
+          mergeHeartRate(other.getHeartRate());
+        }
+        if (other.hasCadence()) {
+          mergeCadence(other.getCadence());
+        }
+        if (other.hasPower()) {
+          mergePower(other.getPower());
+        }
+        if (other.hasBatteryLevel()) {
+          mergeBatteryLevel(other.getBatteryLevel());
+        }
+        return this;
+      }
+      
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              return this;
+            default: {
+              if (!parseUnknownField(input, extensionRegistry, tag)) {
+                return this;
+              }
+              break;
+            }
+            case 8: {
+              setCreationTime(input.readUInt64());
+              break;
+            }
+            case 18: {
+              com.google.android.apps.mytracks.content.Sensor.SensorData.Builder subBuilder = com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder();
+              if (hasHeartRate()) {
+                subBuilder.mergeFrom(getHeartRate());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setHeartRate(subBuilder.buildPartial());
+              break;
+            }
+            case 26: {
+              com.google.android.apps.mytracks.content.Sensor.SensorData.Builder subBuilder = com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder();
+              if (hasCadence()) {
+                subBuilder.mergeFrom(getCadence());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setCadence(subBuilder.buildPartial());
+              break;
+            }
+            case 34: {
+              com.google.android.apps.mytracks.content.Sensor.SensorData.Builder subBuilder = com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder();
+              if (hasPower()) {
+                subBuilder.mergeFrom(getPower());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setPower(subBuilder.buildPartial());
+              break;
+            }
+            case 42: {
+              com.google.android.apps.mytracks.content.Sensor.SensorData.Builder subBuilder = com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder();
+              if (hasBatteryLevel()) {
+                subBuilder.mergeFrom(getBatteryLevel());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setBatteryLevel(subBuilder.buildPartial());
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      // optional uint64 creation_time = 1 [default = 0];
+      public boolean hasCreationTime() {
+        return result.hasCreationTime();
+      }
+      public long getCreationTime() {
+        return result.getCreationTime();
+      }
+      public Builder setCreationTime(long value) {
+        result.hasCreationTime = true;
+        result.creationTime_ = value;
+        return this;
+      }
+      public Builder clearCreationTime() {
+        result.hasCreationTime = false;
+        result.creationTime_ = 0L;
+        return this;
+      }
+      
+      // optional .com.google.android.apps.mytracks.content.SensorData heart_rate = 2;
+      public boolean hasHeartRate() {
+        return result.hasHeartRate();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorData getHeartRate() {
+        return result.getHeartRate();
+      }
+      public Builder setHeartRate(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        result.hasHeartRate = true;
+        result.heartRate_ = value;
+        return this;
+      }
+      public Builder setHeartRate(com.google.android.apps.mytracks.content.Sensor.SensorData.Builder builderForValue) {
+        result.hasHeartRate = true;
+        result.heartRate_ = builderForValue.build();
+        return this;
+      }
+      public Builder mergeHeartRate(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (result.hasHeartRate() &&
+            result.heartRate_ != com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance()) {
+          result.heartRate_ =
+            com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder(result.heartRate_).mergeFrom(value).buildPartial();
+        } else {
+          result.heartRate_ = value;
+        }
+        result.hasHeartRate = true;
+        return this;
+      }
+      public Builder clearHeartRate() {
+        result.hasHeartRate = false;
+        result.heartRate_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+        return this;
+      }
+      
+      // optional .com.google.android.apps.mytracks.content.SensorData cadence = 3;
+      public boolean hasCadence() {
+        return result.hasCadence();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorData getCadence() {
+        return result.getCadence();
+      }
+      public Builder setCadence(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        result.hasCadence = true;
+        result.cadence_ = value;
+        return this;
+      }
+      public Builder setCadence(com.google.android.apps.mytracks.content.Sensor.SensorData.Builder builderForValue) {
+        result.hasCadence = true;
+        result.cadence_ = builderForValue.build();
+        return this;
+      }
+      public Builder mergeCadence(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (result.hasCadence() &&
+            result.cadence_ != com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance()) {
+          result.cadence_ =
+            com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder(result.cadence_).mergeFrom(value).buildPartial();
+        } else {
+          result.cadence_ = value;
+        }
+        result.hasCadence = true;
+        return this;
+      }
+      public Builder clearCadence() {
+        result.hasCadence = false;
+        result.cadence_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+        return this;
+      }
+      
+      // optional .com.google.android.apps.mytracks.content.SensorData power = 4;
+      public boolean hasPower() {
+        return result.hasPower();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorData getPower() {
+        return result.getPower();
+      }
+      public Builder setPower(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        result.hasPower = true;
+        result.power_ = value;
+        return this;
+      }
+      public Builder setPower(com.google.android.apps.mytracks.content.Sensor.SensorData.Builder builderForValue) {
+        result.hasPower = true;
+        result.power_ = builderForValue.build();
+        return this;
+      }
+      public Builder mergePower(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (result.hasPower() &&
+            result.power_ != com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance()) {
+          result.power_ =
+            com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder(result.power_).mergeFrom(value).buildPartial();
+        } else {
+          result.power_ = value;
+        }
+        result.hasPower = true;
+        return this;
+      }
+      public Builder clearPower() {
+        result.hasPower = false;
+        result.power_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+        return this;
+      }
+      
+      // optional .com.google.android.apps.mytracks.content.SensorData battery_level = 5;
+      public boolean hasBatteryLevel() {
+        return result.hasBatteryLevel();
+      }
+      public com.google.android.apps.mytracks.content.Sensor.SensorData getBatteryLevel() {
+        return result.getBatteryLevel();
+      }
+      public Builder setBatteryLevel(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        result.hasBatteryLevel = true;
+        result.batteryLevel_ = value;
+        return this;
+      }
+      public Builder setBatteryLevel(com.google.android.apps.mytracks.content.Sensor.SensorData.Builder builderForValue) {
+        result.hasBatteryLevel = true;
+        result.batteryLevel_ = builderForValue.build();
+        return this;
+      }
+      public Builder mergeBatteryLevel(com.google.android.apps.mytracks.content.Sensor.SensorData value) {
+        if (result.hasBatteryLevel() &&
+            result.batteryLevel_ != com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance()) {
+          result.batteryLevel_ =
+            com.google.android.apps.mytracks.content.Sensor.SensorData.newBuilder(result.batteryLevel_).mergeFrom(value).buildPartial();
+        } else {
+          result.batteryLevel_ = value;
+        }
+        result.hasBatteryLevel = true;
+        return this;
+      }
+      public Builder clearBatteryLevel() {
+        result.hasBatteryLevel = false;
+        result.batteryLevel_ = com.google.android.apps.mytracks.content.Sensor.SensorData.getDefaultInstance();
+        return this;
+      }
+      
+      // @@protoc_insertion_point(builder_scope:com.google.android.apps.mytracks.content.SensorDataSet)
+    }
+    
+    static {
+      defaultInstance = new SensorDataSet(true);
+      com.google.android.apps.mytracks.content.Sensor.internalForceInit();
+      defaultInstance.initFields();
+    }
+    
+    // @@protoc_insertion_point(class_scope:com.google.android.apps.mytracks.content.SensorDataSet)
+  }
+  
+  
+  static {
+  }
+  
+  public static void internalForceInit() {}
+  
+  // @@protoc_insertion_point(outer_class_scope)
+}
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2008 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 com.google.android.apps.mytracks.stats.TripStatistics;
+
+import android.location.Location;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+
+/**
+ * A track.
+ * 
+ * @author Leif Hendrik Wilden
+ * @author Rodrigo Damazio
+ */
+public class Track implements Parcelable {
+
+  private long id = -1;
+  private String name = "";
+  private String description = "";
+  private String category = "";
+  private long startId = -1;
+  private long stopId = -1;
+
+  // The number of location points (present even if the points themselves are
+  // not loaded)
+  private int numberOfPoints = 0;
+  private String mapId = "";
+  private String tableId = "";
+  private String icon = "";
+
+  private TripStatistics tripStatistics = new TripStatistics();
+
+  // Location points (which may not have been loaded)
+  private ArrayList<Location> locations = new ArrayList<Location>();
+
+  public Track() {}
+
+  private Track(Parcel in) {
+    id = in.readLong();
+    name = in.readString();
+    description = in.readString();
+    category = in.readString();
+    startId = in.readLong();
+    stopId = in.readLong();
+    numberOfPoints = in.readInt();
+    mapId = in.readString();
+    tableId = in.readString();
+    icon = in.readString();
+
+    ClassLoader classLoader = getClass().getClassLoader();
+    tripStatistics = in.readParcelable(classLoader);
+
+    for (int i = 0; i < numberOfPoints; ++i) {
+      Location loc = in.readParcelable(classLoader);
+      locations.add(loc);
+    }
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(id);
+    dest.writeString(name);
+    dest.writeString(description);
+    dest.writeString(category);
+    dest.writeLong(startId);
+    dest.writeLong(stopId);
+    dest.writeInt(numberOfPoints);
+    dest.writeString(mapId);
+    dest.writeString(tableId);
+    dest.writeString(icon);
+    dest.writeParcelable(tripStatistics, 0);
+    for (int i = 0; i < numberOfPoints; ++i) {
+      dest.writeParcelable(locations.get(i), 0);
+    }
+  }
+
+  public static final Parcelable.Creator<Track> CREATOR = new Parcelable.Creator<Track>() {
+      @Override
+    public Track createFromParcel(Parcel in) {
+      return new Track(in);
+    }
+
+      @Override
+    public Track[] newArray(int size) {
+      return new Track[size];
+    }
+  };
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getCategory() {
+    return category;
+  }
+
+  public void setCategory(String category) {
+    this.category = category;
+  }
+
+  public long getStartId() {
+    return startId;
+  }
+
+  public void setStartId(long startId) {
+    this.startId = startId;
+  }
+
+  public long getStopId() {
+    return stopId;
+  }
+
+  public void setStopId(long stopId) {
+    this.stopId = stopId;
+  }
+
+  public int getNumberOfPoints() {
+    return numberOfPoints;
+  }
+
+  public void setNumberOfPoints(int numberOfPoints) {
+    this.numberOfPoints = numberOfPoints;
+  }
+
+  public String getMapId() {
+    return mapId;
+  }
+
+  public void setMapId(String mapId) {
+    this.mapId = mapId;
+  }
+
+  public String getTableId() {
+    return tableId;
+  }
+
+  public void setTableId(String tableId) {
+    this.tableId = tableId;
+  }
+
+  public String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(String icon) {
+    this.icon = icon;
+  }
+
+  public TripStatistics getTripStatistics() {
+    return tripStatistics;
+  }
+
+  public void setTripStatistics(TripStatistics tripStatistics) {
+    this.tripStatistics = tripStatistics;
+  }
+
+  public void addLocation(Location l) {
+    locations.add(l);
+  }
+
+  public ArrayList<Location> getLocations() {
+    return locations;
+  }
+
+  public void setLocations(ArrayList<Location> locations) {
+    this.locations = locations;
+  }
+}
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2008 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 static com.google.android.apps.mytracks.content.ContentTypeIds.BLOB_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.FLOAT_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.INT_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.LONG_TYPE_ID;
+
+import android.net.Uri;
+import android.provider.BaseColumns;
+
+/**
+ * Constants for the track points table.
+ *
+ * @author Leif Hendrik Wilden
+ */
+public interface TrackPointsColumns extends BaseColumns {
+
+  public static final String TABLE_NAME = "trackpoints";
+  public static final Uri CONTENT_URI = Uri.parse(
+      "content://com.google.android.maps.mytracks/trackpoints");
+  public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.trackpoint";
+  public static final String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.trackpoint";
+  public static final String DEFAULT_SORT_ORDER = "_id";
+
+  // Columns
+  public static final String TRACKID = "trackid"; // track id
+  public static final String LONGITUDE = "longitude"; // longitude
+  public static final String LATITUDE = "latitude"; // latitude
+  public static final String TIME = "time"; // time
+  public static final String ALTITUDE = "elevation"; // altitude
+  public static final String ACCURACY = "accuracy"; // accuracy
+  public static final String SPEED = "speed"; // speed
+  public static final String BEARING = "bearing"; // bearing
+  public static final String SENSOR = "sensor"; // sensor
+
+  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("
+      + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+      + TRACKID + " INTEGER, "
+      + LONGITUDE + " INTEGER, "
+      + LATITUDE + " INTEGER, "
+      + TIME + " INTEGER, "
+      + ALTITUDE + " FLOAT, "
+      + ACCURACY + " FLOAT, "
+      + SPEED + " FLOAT, "
+      + BEARING + " FLOAT, "
+      + SENSOR + " BLOB" 
+      + ");";
+
+  public static final String[] COLUMNS = {
+      _ID,
+      TRACKID,
+      LONGITUDE,
+      LATITUDE,
+      TIME,
+      ALTITUDE,
+      ACCURACY,
+      SPEED,
+      BEARING,
+      SENSOR
+   };
+
+   public static final byte[] COLUMN_TYPES = {
+       LONG_TYPE_ID, // id
+       LONG_TYPE_ID, // track id
+       INT_TYPE_ID, // longitude
+       INT_TYPE_ID, // latitude
+       LONG_TYPE_ID, // time
+       FLOAT_TYPE_ID, // altitude
+       FLOAT_TYPE_ID, // accuracy
+       FLOAT_TYPE_ID, // speed
+       FLOAT_TYPE_ID, // bearing
+       BLOB_TYPE_ID // sensor
+   };
+}
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2008 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 android.net.Uri;
+import android.provider.BaseColumns;
+
+/**
+ * Constants for the tracks table.
+ * 
+ * @author Leif Hendrik Wilden
+ */
+public interface TracksColumns extends BaseColumns {
+
+  public static final String TABLE_NAME = "tracks";
+
+  /**
+   * Tracks provider uri.
+   */
+  public static final Uri CONTENT_URI = Uri.parse(
+      "content://com.google.android.maps.mytracks/tracks");
+
+  /**
+   * Track content type.
+   */
+  public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.track";
+
+  /**
+   * Track id content type.
+   */
+  public static final String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.track";
+
+  /**
+   * Tracks table default sort order.
+   */
+  public static final String DEFAULT_SORT_ORDER = "_id";
+
+  // Columns
+  public static final String NAME = "name"; // track name
+  public static final String DESCRIPTION = "description"; // track description
+  public static final String CATEGORY = "category"; // track activity type
+  public static final String STARTID = "startid"; // first track point id
+  public static final String STOPID = "stopid"; // last track point id
+  public static final String STARTTIME = "starttime"; // track start time
+  public static final String STOPTIME = "stoptime"; // track stop time
+  public static final String NUMPOINTS = "numpoints"; // number of track points
+  public static final String TOTALDISTANCE = "totaldistance"; // total distance
+  public static final String TOTALTIME = "totaltime"; // total time
+  public static final String MOVINGTIME = "movingtime"; // moving time
+  public static final String MINLAT = "minlat"; // minimum latitude
+  public static final String MAXLAT = "maxlat"; // maximum latitude
+  public static final String MINLON = "minlon"; // minimum longitude
+  public static final String MAXLON = "maxlon"; // maximum longitude
+  public static final String AVGSPEED = "avgspeed"; // average speed
+  public static final String AVGMOVINGSPEED = "avgmovingspeed"; // average moving speed
+  public static final String MAXSPEED = "maxspeed"; // maximum speed
+  public static final String MINELEVATION = "minelevation"; // minimum elevation
+  public static final String MAXELEVATION = "maxelevation"; // maximum elevation
+  public static final String ELEVATIONGAIN = "elevationgain"; // elevation gain
+  public static final String MINGRADE = "mingrade"; // minimum grade
+  public static final String MAXGRADE = "maxgrade"; // maximum grade
+  public static final String MAPID = "mapid"; // Google Maps id
+  public static final String TABLEID = "tableid"; // Google Fusion Tables id
+  public static final String ICON = "icon"; // track activity type icon
+  
+  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" 
+      + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " 
+      + NAME + " STRING, " 
+      + DESCRIPTION + " STRING, "
+      + CATEGORY + " STRING, " 
+      + STARTID + " INTEGER, " 
+      + STOPID + " INTEGER, " 
+      + STARTTIME + " INTEGER, " 
+      + STOPTIME + " INTEGER, " 
+      + NUMPOINTS + " INTEGER, " 
+      + TOTALDISTANCE + " FLOAT, " 
+      + TOTALTIME + " INTEGER, " 
+      + MOVINGTIME + " INTEGER, " 
+      + MINLAT + " INTEGER, "
+      + MAXLAT + " INTEGER, " 
+      + MINLON + " INTEGER, " 
+      + MAXLON + " INTEGER, " 
+      + AVGSPEED + " FLOAT, " 
+      + AVGMOVINGSPEED + " FLOAT, " 
+      + MAXSPEED + " FLOAT, " 
+      + MINELEVATION + " FLOAT, "
+      + MAXELEVATION + " FLOAT, " 
+      + ELEVATIONGAIN + " FLOAT, " 
+      + MINGRADE + " FLOAT, " 
+      + MAXGRADE + " FLOAT, " 
+      + MAPID + " STRING, " 
+      + TABLEID + " STRING, " 
+      + ICON + " STRING" 
+      + ");";
+
+  public static final String[] COLUMNS = {
+      _ID,
+      NAME,
+      DESCRIPTION,
+      CATEGORY,
+      STARTID,
+      STOPID,
+      STARTTIME,
+      STOPTIME,
+      NUMPOINTS,
+      TOTALDISTANCE,
+      TOTALTIME,
+      MOVINGTIME,
+      MINLAT,
+      MAXLAT,
+      MINLON,
+      MAXLON,
+      AVGSPEED,
+      AVGMOVINGSPEED,
+      MAXSPEED,
+      MINELEVATION,
+      MAXELEVATION,
+      ELEVATIONGAIN,
+      MINGRADE,
+      MAXGRADE,
+      MAPID,
+      TABLEID,
+      ICON
+  };
+
+  public static final byte[] COLUMN_TYPES = {
+      ContentTypeIds.LONG_TYPE_ID, // id
+      ContentTypeIds.STRING_TYPE_ID, // name
+      ContentTypeIds.STRING_TYPE_ID, // description
+      ContentTypeIds.STRING_TYPE_ID, // category
+      ContentTypeIds.LONG_TYPE_ID, // start id
+      ContentTypeIds.LONG_TYPE_ID, // stop id
+      ContentTypeIds.LONG_TYPE_ID, // start time
+      ContentTypeIds.LONG_TYPE_ID, // stop time
+      ContentTypeIds.INT_TYPE_ID, // num points
+      ContentTypeIds.FLOAT_TYPE_ID, // total distance
+      ContentTypeIds.LONG_TYPE_ID, // total time
+      ContentTypeIds.LONG_TYPE_ID, // moving time
+      ContentTypeIds.INT_TYPE_ID, // min latitude
+      ContentTypeIds.INT_TYPE_ID, // max latitude
+      ContentTypeIds.INT_TYPE_ID, // min longitude
+      ContentTypeIds.INT_TYPE_ID, // max longitude
+      ContentTypeIds.FLOAT_TYPE_ID, // average speed
+      ContentTypeIds.FLOAT_TYPE_ID, // average moving speed
+      ContentTypeIds.FLOAT_TYPE_ID, // max speed
+      ContentTypeIds.FLOAT_TYPE_ID, // min elevation
+      ContentTypeIds.FLOAT_TYPE_ID, // max elevation
+      ContentTypeIds.FLOAT_TYPE_ID, // elevation gain
+      ContentTypeIds.FLOAT_TYPE_ID, // min grade
+      ContentTypeIds.FLOAT_TYPE_ID, // max grade
+      ContentTypeIds.STRING_TYPE_ID, // map id
+      ContentTypeIds.STRING_TYPE_ID, // table id
+      ContentTypeIds.STRING_TYPE_ID // icon
+    };
+}
@@ -0,0 +1,2 @@
+package com.google.android.apps.mytracks.content;
+parcelable Waypoint;
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2009 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 com.google.android.apps.mytracks.stats.TripStatistics;
+
+import android.location.Location;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A waypoint.
+ * 
+ * @author Leif Hendrik Wilden
+ * @author Rodrigo Damazio
+ */
+public final class Waypoint implements Parcelable {
+
+  public static final int TYPE_WAYPOINT = 0;
+  public static final int TYPE_STATISTICS = 1;
+
+  private long id = -1;
+  private String name = "";
+  private String description = "";
+  private String category = "";
+  private String icon = "";
+  private long trackId = -1;
+  private int type = 0;
+  private double length = 0.0;
+  private long duration = 0;
+  private long startId = -1;
+  private long stopId = -1;
+  private Location location = null;
+  private TripStatistics tripStatistics = null;
+
+  public Waypoint() {}
+  
+  private Waypoint(Parcel source) {
+    id = source.readLong();
+    name = source.readString();
+    description = source.readString();
+    category = source.readString();
+    icon = source.readString();
+    trackId = source.readLong();
+    type = source.readInt();
+    length = source.readDouble();
+    duration = source.readLong();
+    startId = source.readLong();
+    stopId = source.readLong();
+ 
+    ClassLoader classLoader = getClass().getClassLoader();
+    byte hasLocation = source.readByte();
+    if (hasLocation > 0) {
+      location = source.readParcelable(classLoader);
+    }
+    byte hasStats = source.readByte();
+    if (hasStats > 0) {
+      tripStatistics = source.readParcelable(classLoader);
+    }
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(id);
+    dest.writeString(name);
+    dest.writeString(description);
+    dest.writeString(category);
+    dest.writeString(icon);
+    dest.writeLong(trackId);
+    dest.writeInt(type);
+    dest.writeDouble(length);
+    dest.writeLong(duration);
+    dest.writeLong(startId);
+    dest.writeLong(stopId);
+    dest.writeByte(location == null ? (byte) 0 : (byte) 1);
+    if (location != null) {
+      dest.writeParcelable(location, 0);
+    }
+    dest.writeByte(tripStatistics == null ? (byte) 0 : (byte) 1);
+    if (tripStatistics != null) {
+      dest.writeParcelable(tripStatistics, 0);
+    }
+  }
+
+  public static final Parcelable.Creator<Waypoint> CREATOR = new Parcelable.Creator<Waypoint>() {
+      @Override
+    public Waypoint createFromParcel(Parcel in) {
+      return new Waypoint(in);
+    }
+
+      @Override
+    public Waypoint[] newArray(int size) {
+      return new Waypoint[size];
+    }
+  };
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getCategory() {
+    return category;
+  }
+
+  public void setCategory(String category) {
+    this.category = category;
+  }
+
+  public String getIcon() {
+    return icon;
+  }
+
+  public void setIcon(String icon) {
+    this.icon = icon;
+  }
+
+  public long getTrackId() {
+    return trackId;
+  }
+
+  public void setTrackId(long trackId) {
+    this.trackId = trackId;
+  }
+
+  public int getType() {
+    return type;
+  }
+
+  public void setType(int type) {
+    this.type = type;
+  }
+
+  public double getLength() {
+    return length;
+  }
+
+  public void setLength(double length) {
+    this.length = length;
+  }
+
+  public long getDuration() {
+    return duration;
+  }
+
+  public void setDuration(long duration) {
+    this.duration = duration;
+  }
+
+  public long getStartId() {
+    return startId;
+  }
+
+  public void setStartId(long startId) {
+    this.startId = startId;
+  }
+
+  public long getStopId() {
+    return stopId;
+  }
+
+  public void setStopId(long stopId) {
+    this.stopId = stopId;
+  }
+
+  public Location getLocation() {
+    return location;
+  }
+
+  public void setLocation(Location location) {
+    this.location = location;
+  }
+
+  public TripStatistics getTripStatistics() {
+    return tripStatistics;
+  }
+
+  public void setTripStatistics(TripStatistics tripStatistics) {
+    this.tripStatistics = tripStatistics;
+  }
+}
@@ -0,0 +1,2 @@
+package com.google.android.apps.mytracks.content;
+parcelable WaypointCreationRequest;
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2010 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 android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A request for the service to create a waypoint at the current location.
+ * 
+ * @author Sandor Dornbush
+ */
+public class WaypointCreationRequest implements Parcelable {
+
+  public static enum WaypointType {
+    WAYPOINT, STATISTICS;
+  }
+
+  private WaypointType type;
+  // true if this marker contains the track statistics
+  private boolean isTrackStatistics;
+  private String name;
+  private String category;
+  private String description;
+  private String iconUrl;
+
+  public final static WaypointCreationRequest DEFAULT_WAYPOINT = new WaypointCreationRequest(
+      WaypointType.WAYPOINT, false);
+  public final static WaypointCreationRequest DEFAULT_STATISTICS = new WaypointCreationRequest(
+      WaypointType.STATISTICS, false);
+  public final static WaypointCreationRequest DEFAULT_START_TRACK = new WaypointCreationRequest(
+      WaypointType.STATISTICS, true);
+
+  private WaypointCreationRequest(WaypointType type, boolean isTrackStatistics) {
+    this(type, isTrackStatistics, null, null, null, null);
+  }
+
+  public WaypointCreationRequest(WaypointType type, boolean isTrackStatistics, String name,
+      String category, String description, String iconUrl) {
+    this.type = type;
+    this.isTrackStatistics = isTrackStatistics;
+    this.name = name;
+    this.category = category;
+    this.description = description;
+    this.iconUrl = iconUrl;
+  }
+
+  public static class Creator implements Parcelable.Creator<WaypointCreationRequest> {
+
+    @Override
+    public WaypointCreationRequest createFromParcel(Parcel source) {
+      WaypointCreationRequest request = new WaypointCreationRequest(
+          WaypointType.values()[source.readInt()],
+          source.readByte() == 1,
+          source.readString(),
+          source.readString(),
+          source.readString(),
+          source.readString());
+      return request;
+    }
+
+    public WaypointCreationRequest[] newArray(int size) {
+      return new WaypointCreationRequest[size];
+    }
+  }
+
+  public static final Creator CREATOR = new Creator();
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel parcel, int arg1) {
+    parcel.writeInt(type.ordinal());
+    parcel.writeByte((byte) (isTrackStatistics ? 1 : 0));
+    parcel.writeString(name);
+    parcel.writeString(category);
+    parcel.writeString(description);
+    parcel.writeString(iconUrl);
+  }
+
+  public WaypointType getType() {
+    return type;
+  }
+
+  public boolean isTrackStatistics() {
+    return isTrackStatistics;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getCategory() {
+    return category;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public String getIconUrl() {
+    return iconUrl;
+  }
+}
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2009 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 static com.google.android.apps.mytracks.content.ContentTypeIds.FLOAT_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.INT_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.LONG_TYPE_ID;
+import static com.google.android.apps.mytracks.content.ContentTypeIds.STRING_TYPE_ID;
+
+import android.net.Uri;
+import android.provider.BaseColumns;
+
+/**
+ * Constants for waypoints table.
+ * 
+ * @author Leif Hendrik Wilden
+ */
+public interface WaypointsColumns extends BaseColumns {
+
+  public static final String TABLE_NAME = "waypoints";
+  public static final Uri CONTENT_URI = Uri.parse(
+      "content://com.google.android.maps.mytracks/waypoints");
+  public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.waypoint";
+  public static final String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.waypoint";
+  public static final String DEFAULT_SORT_ORDER = "_id";
+
+  // Columns
+  public static final String NAME = "name"; // waypoint name
+  public static final String DESCRIPTION = "description"; // waypoint description
+  public static final String CATEGORY = "category"; // waypoint category
+  public static final String ICON = "icon"; // waypoint icon
+  public static final String TRACKID = "trackid"; // track id
+  public static final String TYPE = "type"; // type
+  public static final String LENGTH = "length"; // length of the track (without smoothing) 
+  public static final String DURATION = "duration"; // total duration of the track (not from last waypoint)
+  public static final String STARTTIME = "starttime"; // start time of the trip statistics 
+  public static final String STARTID = "startid"; // start track point id
+  public static final String STOPID = "stopid"; // stop track point id
+
+  public static final String LONGITUDE = "longitude"; // longitude
+  public static final String LATITUDE = "latitude"; // latitude
+  public static final String TIME = "time"; // time
+  public static final String ALTITUDE = "elevation"; // altitude
+  public static final String ACCURACY = "accuracy"; // accuracy
+  public static final String SPEED = "speed"; // speed  
+  public static final String BEARING = "bearing"; // bearing
+
+  public static final String TOTALDISTANCE = "totaldistance"; // total distance
+  public static final String TOTALTIME = "totaltime"; // total time
+  public static final String MOVINGTIME = "movingtime"; // moving time
+  public static final String AVGSPEED = "avgspeed"; // average speed
+  public static final String AVGMOVINGSPEED = "avgmovingspeed"; // average moving speed
+  public static final String MAXSPEED = "maxspeed"; // max speed
+  public static final String MINELEVATION = "minelevation"; // min elevation
+  public static final String MAXELEVATION = "maxelevation"; // max elevation
+  public static final String ELEVATIONGAIN = "elevationgain"; // elevation gain
+  public static final String MINGRADE = "mingrade"; // min grade
+  public static final String MAXGRADE = "maxgrade"; // max grade
+  
+  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" 
+      + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+      + NAME + " STRING, "
+      + DESCRIPTION + " STRING, "
+      + CATEGORY + " STRING, "
+      + ICON + " STRING, "
+      + TRACKID + " INTEGER, "
+      + TYPE + " INTEGER, "
+      + LENGTH + " FLOAT, "
+      + DURATION + " INTEGER, "
+      + STARTTIME + " INTEGER, "
+      + STARTID + " INTEGER, "
+      + STOPID + " INTEGER, "
+      + LONGITUDE + " INTEGER, "
+      + LATITUDE + " INTEGER, "
+      + TIME + " INTEGER, "
+      + ALTITUDE + " FLOAT, "
+      + ACCURACY + " FLOAT, "
+      + SPEED + " FLOAT, "
+      + BEARING + " FLOAT, "
+      + TOTALDISTANCE + " FLOAT, "
+      + TOTALTIME + " INTEGER, "
+      + MOVINGTIME + " INTEGER, "
+      + AVGSPEED + " FLOAT, "
+      + AVGMOVINGSPEED + " FLOAT, "
+      + MAXSPEED + " FLOAT, "
+      + MINELEVATION + " FLOAT, "
+      + MAXELEVATION + " FLOAT, "
+      + ELEVATIONGAIN + " FLOAT, "
+      + MINGRADE + " FLOAT, "
+      + MAXGRADE + " FLOAT" 
+      + ");";
+  
+  public static final String[] COLUMNS = {
+      _ID,
+      NAME,
+      DESCRIPTION,
+      CATEGORY,
+      ICON,
+      TRACKID,
+      TYPE,
+      LENGTH,
+      DURATION,
+      STARTTIME,
+      STARTID,
+      STOPID,
+      LONGITUDE,
+      LATITUDE,
+      TIME,
+      ALTITUDE,
+      ACCURACY,
+      SPEED,
+      BEARING,
+      TOTALDISTANCE,
+      TOTALTIME,
+      MOVINGTIME,
+      AVGSPEED,
+      AVGMOVINGSPEED,
+      MAXSPEED,
+      MINELEVATION,
+      MAXELEVATION,
+      ELEVATIONGAIN,
+      MINGRADE,
+      MAXGRADE
+    };
+    
+  public static final byte[] COLUMN_TYPES = {
+      LONG_TYPE_ID, // id
+      STRING_TYPE_ID, // name
+      STRING_TYPE_ID, // description
+      STRING_TYPE_ID, // category
+      STRING_TYPE_ID, // icon
+      LONG_TYPE_ID, // track id
+      INT_TYPE_ID, // type
+      FLOAT_TYPE_ID, // length
+      LONG_TYPE_ID, // duration
+      LONG_TYPE_ID, // start time
+      LONG_TYPE_ID, // start id
+      LONG_TYPE_ID, // stop id
+      INT_TYPE_ID, // longitude
+      INT_TYPE_ID, // latitude
+      LONG_TYPE_ID, // time
+      FLOAT_TYPE_ID, // altitude
+      FLOAT_TYPE_ID, // accuracy
+      FLOAT_TYPE_ID, // speed
+      FLOAT_TYPE_ID, // bearing
+      FLOAT_TYPE_ID, // total distance
+      LONG_TYPE_ID, // total time
+      LONG_TYPE_ID, // moving time
+      FLOAT_TYPE_ID, // average speed
+      FLOAT_TYPE_ID, // average moving speed
+      FLOAT_TYPE_ID, // max speed
+      FLOAT_TYPE_ID, // min elevation
+      FLOAT_TYPE_ID, // max elevation
+      FLOAT_TYPE_ID, // elevation gain
+      FLOAT_TYPE_ID, // min grade
+      FLOAT_TYPE_ID // max grade
+    };
+}