Merging sensor and library changes together.

MyTracksLib/.classpath

@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.3.0-lite.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

MyTracksLib/proto/sensor.proto

@@ -0,0 +1,53 @@
+// 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;
+
+option optimize_for = LITE_RUNTIME;
+
+// An enumeration of the state of a single sensor.
+enum SensorState {
+  // There is no sensor.
+  NONE = 1;
+
+  // Now initiating an outgoing connection.
+  CONNECTING = 2;
+
+  // Now connected to a remote device.
+  CONNECTED = 3;
+
+  // A state where the sensor is not connected.
+  DISCONNECTED = 4;
+
+  // This is the only state where the sensor data can be used.
+  SENDING = 5;
+};
+
+// The state and possible reading for one integer sensor.
+message SensorData {
+  required SensorState state = 1 [default = NONE];
+  
+  // Value is only defined if state = SENDING.
+  optional int32 value = 2;
+};
+
+// A message to encapsulate sensor readings associated with a track point.
+message SensorDataSet {
+  // This is a required field.
+  optional uint64 creation_time = 1 [default = 0];
+  
+  optional SensorData heart_rate = 2;
+  optional SensorData cadence = 3;
+  optional SensorData power = 4;
+}

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

@@ -0,0 +1,64 @@
+/*
+ * 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.location.Location;
+
+/**
+ * This class extends the standard Android location with extra information.
+ *
+ * @author Sandor Dornbush
+ */
+public class MyTracksLocation extends Location {
+
+  private Sensor.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 string) {
+    super(string);
+  }
+
+  public Sensor.SensorDataSet getSensorDataSet() {
+    return sensorDataSet;
+  }
+
+  public void setSensorData(Sensor.SensorDataSet sensorData) {
+    this.sensorDataSet = sensorData;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+  
+  public void reset() {
+    super.reset();
+    sensorDataSet = null;
+    id = -1;
+  }
+}

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

@@ -16,7 +16,9 @@
 package com.google.android.apps.mytracks.content;
 
 import static com.google.android.apps.mytracks.lib.MyTracksLibConstants.*;
+import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.protobuf.InvalidProtocolBufferException;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -75,6 +77,12 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     if (location.hasSpeed()) {
       values.put(TrackPointsColumns.SPEED, location.getSpeed());
     }
+    if (location instanceof MyTracksLocation) {
+      MyTracksLocation mtLocation = (MyTracksLocation) location;
+      if (mtLocation.getSensorDataSet() != null) {
+        values.put(TrackPointsColumns.SENSOR, mtLocation.getSensorDataSet().toByteArray());
+      }
+    }
     return values;
   }
 
@@ -172,7 +180,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public Location createLocation(Cursor cursor) {
-    Location location = new Location("");
+    Location location = new MyTracksLocation("");
     fillLocation(cursor, location);
     return location;
   }
@@ -189,6 +197,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     int idxBearing = cursor.getColumnIndexOrThrow(TrackPointsColumns.BEARING);
     int idxAccuracy = cursor.getColumnIndexOrThrow(TrackPointsColumns.ACCURACY);
     int idxSpeed = cursor.getColumnIndexOrThrow(TrackPointsColumns.SPEED);
+    int idxSensor = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR);
 
     if (!cursor.isNull(idxLatitude)) {
       location.setLatitude(1. * cursor.getInt(idxLatitude) / 1E6);
@@ -211,6 +220,18 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     if (!cursor.isNull(idxAccuracy)) {
       location.setAccuracy(cursor.getFloat(idxAccuracy));
     }
+    if (location instanceof MyTracksLocation &&
+        !cursor.isNull(idxSensor)) {
+      MyTracksLocation mtLocation = (MyTracksLocation) location;
+      // TODO get the right buffer.
+      Sensor.SensorDataSet sensorData;
+      try {
+        sensorData = Sensor.SensorDataSet.parseFrom(cursor.getBlob(idxSensor));
+        mtLocation.setSensorData(sensorData);
+      } catch (InvalidProtocolBufferException e) {
+        Log.w(TAG, "Failed to parse sensor data.", e);
+      }
+    }
   }
 
   @Override
@@ -450,7 +471,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
   @Override
   public void deleteAllTracks() {
     contentResolver.delete(TracksColumns.CONTENT_URI, null, null);
-    contentResolver.delete(TrackPointsColumns.CONTENT_URI, null, null);
+    contentResolver.delete(TrackPointsColumns.CONTENT_URI,
+        null, null);
     contentResolver.delete(WaypointsColumns.CONTENT_URI, null, null);
   }
 
@@ -464,7 +486,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     }
     contentResolver.delete(WaypointsColumns.CONTENT_URI,
         WaypointsColumns.TRACKID + "=" + trackId, null);
-    contentResolver.delete(TracksColumns.CONTENT_URI, "_id=" + trackId, null);
+    contentResolver.delete(
+        TracksColumns.CONTENT_URI, "_id=" + trackId, null);
   }
 
   @Override

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

@@ -0,0 +1,816 @@
+// 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_; }
+    
+    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();
+    }
+    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;
+      }
+      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());
+      }
+    }
+    
+    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());
+      }
+      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());
+        }
+        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;
+            }
+          }
+        }
+      }
+      
+      
+      // 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;
+      }
+      
+      // @@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)
+}

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

@@ -42,4 +42,5 @@ public interface TrackPointsColumns extends BaseColumns {
   public static final String TIME = "time";
   public static final String ACCURACY = "accuracy";
   public static final String SPEED = "speed";
+  public static final String SENSOR = "sensor";
 }

MyTracksLib/src/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl

@@ -84,4 +84,18 @@ interface ITrackRecordingService {
    * Deletes all the stored tracks.
    */
   void deleteAllTracks();
+
+  /**
+   * The current sensor data.
+   * The data is returned as a byte array which is a binary version of a
+   * Sensor.SensorDataSet object.
+   * @return the current sensor data or null if there is none.
+   */
+  byte[] getSensorData();
+
+  /**
+   * The current state of the sensor manager.
+   * The value is the value of a Sensor.SensorState enum.
+   */
+  int getSensorState();
 }

MyTracksLib/src/com/google/android/apps/mytracks/stats/ExtremityMonitor.java

@@ -103,6 +103,11 @@ public class ExtremityMonitor {
   public void setMax(double max) {
     this.max = max;
   }
+
+  public boolean hasData() {
+    return min != Double.POSITIVE_INFINITY
+        && max != Double.NEGATIVE_INFINITY;
+  }
   
   @Override
   public String toString() {