merge heads

This commit is contained in:
Jimmy Shih
2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -213,7 +213,7 @@ public class StatsUtilities {
double minElevation, double maxElevation, double elevationGain,
double minGrade, double maxGrade) {
setTime(R.id.moving_time_register, movingTime);
setDistance(R.id.total_distance_register, totalDistance / 1000);
setDistance(R.id.total_distance_register, totalDistance / 1000.0);
setSpeed(R.id.average_speed_register, averageSpeed * 3.6);
setSpeed(R.id.average_moving_speed_register, averageMovingSpeed * 3.6);
setSpeed(R.id.max_speed_register, maxSpeed * 3.6);
@@ -226,7 +226,7 @@ public class StatsUtilities {
public void setAllStats(TripStatistics stats) {
setTime(R.id.moving_time_register, stats.getMovingTime());
setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000);
setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000.0);
setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * 3.6);
setSpeed(R.id.average_moving_speed_register,
stats.getAverageMovingSpeed() * 3.6);