merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -131,7 +131,7 @@ public class TripStatisticsUpdater {
   *          calorie
   */
  public void addLocation(Location location, int minRecordingDistance,
-      boolean calculateCalorie, ActivityType activityType, int weight) {
+      boolean calculateCalorie, ActivityType activityType, double weight) {
    // Always update time
    updateTime(location.getTime());
    if (!LocationUtils.isValidLocation(location)) {