Clean up ChartValueSeries.

- include metric and imperial title id
- include both speed and pace series

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

@@ -22,195 +22,93 @@ import com.google.common.annotations.VisibleForTesting;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 
 import java.text.NumberFormat;
 
 /**
- * This class encapsulates the meta data for one series of chart values.
- *
+ * This class encapsulates the meta data for one series of the chart values.
+ * 
  * @author Sandor Dornbush
  */
 public class ChartValueSeries {
 
   private static final float STROKE_WIDTH = 2f;
 
+  private final int absoluteMin;
+  private final int absoluteMax;
+  private final int[] intervalValues;
+  private final int metricTitleId;
+  private final int imperialTitleId;
+  private final Paint fillPaint;
+  private final Paint strokePaint;
+  private final Paint titlePaint;
+  private final Paint markerPaint;
   private final ExtremityMonitor extremityMonitor;
   private final NumberFormat numberFormat;
   private final Path path;
-  private final Paint fillPaint;
-  private final Paint strokePaint;
-  private final Paint labelPaint;
-  private final YAxisDimension markingInterval;
-  private String title;
-
-  private boolean enabled = true;
+  
   private int interval = 1;
-  private int effectiveMin = 0;
-  private int effectiveMax = 1;
+  private int minMarkerValue = 0;
+  private int maxMarkerValue = interval * ChartView.Y_AXIS_INTERVALS;
+  private boolean enabled = true;
 
   /**
-   * This class to calculates the y axis dimension, interval, effective min, and
-   * effective max.
-   */
-  public static class YAxisDimension {
-    private final int numberOfIntervals;
-    private final int absoluteMin;
-    private final int absoluteMax;
-    private final int[] intervalValues;
-
-    /**
-     * Constructor.
-     *
-     * @param numberOfIntervals the number of intervals
-     * @param absoluteMin the absolute minimum value
-     * @param absoluteMax the absolute maximum value
-     * @param intervalValues the list of interval values
-     */
-    public YAxisDimension(
-        int numberOfIntervals, int absoluteMin, int absoluteMax, int[] intervalValues) {
-      this.numberOfIntervals = numberOfIntervals;
-      this.absoluteMin = absoluteMin;
-      this.absoluteMax = absoluteMax;
-      this.intervalValues = intervalValues;
-    }
-
-    /**
-     * Gets the y axis dimension. Returns an array of int[3], containing interval, effectiveMin, 
-     * and effectiveMax. 
-     * 
-     * @param min the min value
-     * @param max the max value
-     */
-    public int[] getYAxisDimension(double min, double max) {
-      min = Math.max(min, absoluteMin);
-      max = Math.min(max, absoluteMax);
-      int interval = 0;
-      int effectiveMin = 0;
-      for (int i = 0; i < intervalValues.length; i++) {
-        interval = intervalValues[i];
-        effectiveMin = getEffetiveMin(min, interval);
-        double targetInterval = (max - effectiveMin) / numberOfIntervals;
-        if (interval >= targetInterval) {
-          break;
-        }
-      }
-      int effectiveMax = getEffectiveMax(max, interval);
-      return new int[] { interval, effectiveMin, effectiveMax };
-    }
-
-    /**
-     * Gets the effective min value.
-     * 
-     * @param min the min value
-     * @param interval the interval
-     */
-    private int getEffetiveMin(double min, int interval) {
-      int value = (int) (min / interval) * interval;
-      // value > min if min is negative
-      if (value > min) {
-        return value - interval;
-      }
-      return value;
-    }
-
-    /**
-     * Gets the effective max value
-     * 
-     * @param max the max value
-     * @param interval the interval
-     */
-    private int getEffectiveMax(double max, int interval) {
-      return ((int) (max / interval)) * interval + interval;
-    }
-  }
-
-  /**
-   * Constructs a new chart value series.
-   *
+   * Constructor.
+   * 
    * @param context the context
+   * @param absoluteMin the absolute min value
+   * @param absoluteMax the absolute max value
+   * @param intervalValues the list of interval values
+   * @param metricTitleId the metric title id
+   * @param imperialTitleId the imperial title id
    * @param fillColor the fill color
    * @param strokeColor the stroke color
-   * @param yAxisDimension the marking interval
-   * @param titleId the title id
    */
-  public ChartValueSeries(Context context, int fillColor, int strokeColor,
-      YAxisDimension yAxisDimension, int titleId) {
-    extremityMonitor = new ExtremityMonitor();
-    numberFormat = NumberFormat.getIntegerInstance();
-    path = new Path();
+  public ChartValueSeries(Context context, int absoluteMin, int absoluteMax, int[] intervalValues,
+      int metricTitleId, int imperialTitleId, int fillColor, int strokeColor) {
+    this.absoluteMin = absoluteMin;
+    this.absoluteMax = absoluteMax;
+    this.intervalValues = intervalValues;
+    this.metricTitleId = metricTitleId;
+    this.imperialTitleId = imperialTitleId;
+
     fillPaint = new Paint();
     fillPaint.setStyle(Style.FILL);
     fillPaint.setColor(context.getResources().getColor(fillColor));
     fillPaint.setAntiAlias(true);
-    if (strokeColor != -1) {
-      strokePaint = new Paint();
-      strokePaint.setStyle(Style.STROKE);
-      strokePaint.setColor(context.getResources().getColor(strokeColor));
-      strokePaint.setAntiAlias(true);
-      // Make a copy of the stroke paint with the default thickness
-      labelPaint = new Paint(strokePaint);
-      strokePaint.setStrokeWidth(STROKE_WIDTH);
-    } else {
-      strokePaint = null;
-      labelPaint = fillPaint;
-    }
-    this.markingInterval = yAxisDimension;
-    title = context.getString(titleId);
+
+    strokePaint = new Paint();
+    strokePaint.setStyle(Style.STROKE);
+    strokePaint.setColor(context.getResources().getColor(strokeColor));
+    strokePaint.setAntiAlias(true);
+
+    // Make copies of the stroke paint with the default thickness
+    titlePaint = new Paint(strokePaint);
+    titlePaint.setTextSize(ChartView.LARGE_TEXT_SIZE);
+    titlePaint.setTextAlign(Align.CENTER);
+
+    markerPaint = new Paint(strokePaint);
+    markerPaint.setTextSize(ChartView.MEDIUM_TEXT_SIZE);
+    markerPaint.setTextAlign(Align.RIGHT);
+
+    // Set stroke paint thickness
+    strokePaint.setStrokeWidth(STROKE_WIDTH);
+
+    extremityMonitor = new ExtremityMonitor();
+    numberFormat = NumberFormat.getIntegerInstance();
+    path = new Path();
   }
 
   /**
-   * Returns true if the series has data.
+   * Sets the series enabled value.
+   * 
+   * @param enabled true to enable
    */
-  public boolean hasData() {
-    return extremityMonitor.hasData();
-  }
-  
-  /**
-   * Updates the series with a new value.
-   *
-   * @param value the new value
-   */
-  public void update(double value) {
-    extremityMonitor.update(value);
-  }
-  
-  /**
-   * Gets the number format for the series.
-   */
-  public NumberFormat getNumberFormat() {
-    return numberFormat;
-  }
-  
-  /**
-   * Gets the path.
-   */
-  public Path getPath() {
-    return path;
-  }
-
-  /**
-   * Gets the label paint.
-   */
-  public Paint getLabelPaint() {
-    return labelPaint;
-  }
-  
-  /**
-   * Gets the title.
-   */
-  public String getTitle() {
-    return title;
-  }
-
-  /**
-   * Sets the title.
-   *
-   * @param title the title
-   */
-  public void setTitle(String title) {
-    this.title = title;
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
   }
 
   /**
@@ -221,65 +119,144 @@ public class ChartValueSeries {
   }
 
   /**
-   * Sets the enabled value.
-   *
-   * @param enabled true to enable
+   * Returns true if the series has data.
    */
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
+  public boolean hasData() {
+    return extremityMonitor.hasData();
   }
-  
+
+  /**
+   * Updates the series with a new value.
+   * 
+   * @param value the new value
+   */
+  public void update(double value) {
+    extremityMonitor.update(value);
+  }
+
+  /**
+   * Gets the path.
+   */
+  public Path getPath() {
+    return path;
+  }
+
   /**
    * Draws the path on canvas.
-   *
+   * 
    * @param canvas the canvas
    */
   public void drawPath(Canvas canvas) {
     canvas.drawPath(path, fillPaint);
-    if (strokePaint != null) {
-      canvas.drawPath(path, strokePaint);
-    }
+    canvas.drawPath(path, strokePaint);
   }
 
   /**
    * Updates the y axis dimension.
    */
   public void updateDimension() {
-    boolean hasData = extremityMonitor.hasData();
-    double min = hasData ? extremityMonitor.getMin() : 0.0;
-    double max = hasData ? extremityMonitor.getMax() : 1.0;
-    int[] dimension = markingInterval.getYAxisDimension(min, max);
-    interval = dimension[0];
-    effectiveMin = dimension[1];
-    effectiveMax = dimension[2];
+    double min = hasData() ? extremityMonitor.getMin() : 0.0;
+    double max = hasData() ? extremityMonitor.getMax() : 1.0;
+    min = Math.max(min, absoluteMin);
+    max = Math.min(max, absoluteMax);
+    interval = getInterval(min, max);
+    minMarkerValue = getMinMarkerValue(min, interval);
+    maxMarkerValue = minMarkerValue + interval * ChartView.Y_AXIS_INTERVALS;
   }
 
   /**
-   * Gets the y axis interval value.
+   * Gets the interval value.
+   * 
+   * @param min the min value
+   * @param max the max value
+   */
+  private int getInterval(double min, double max) {
+    for (int i = 0; i < intervalValues.length; i++) {
+      int intervalValue = intervalValues[i];
+      int minValue = getMinMarkerValue(min, intervalValue);
+      double targetInterval = (max - minValue) / ChartView.Y_AXIS_INTERVALS;
+      if (intervalValue >= targetInterval) {
+        return intervalValue;
+      }
+    }
+    // Return the largest interval
+    return intervalValues[intervalValues.length - 1];
+  }
+
+  /**
+   * Gets the min marker value.
+   * 
+   * @param min the min series value
+   * @param intervalValue the interval value
+   */
+  private int getMinMarkerValue(double min, int intervalValue) {
+    // Round down to the nearest intervalValue
+    int value = ((int) (min / intervalValue)) * intervalValue;
+    // value > min if min is negative
+    if (value > min) {
+      return value - intervalValue;
+    }
+    return value;
+  }
+
+  /**
+   * Gets the interval value.
    */
   public int getInterval() {
     return interval;
   }
 
   /**
-   * Gets the minimum value.
+   * Gets the minimum marker value.
    */
-  public int getMin() {
-    return effectiveMin;
+  public int getMinMarkerValue() {
+    return minMarkerValue;
   }
 
   /**
-   * Gets the maximum value.
+   * Gets the maximum marker value.
    */
   @VisibleForTesting
-  int getMax() {
-    return effectiveMax;
+  int getMaxMarkerValue() {
+    return maxMarkerValue;
   }
 
   /**
-   * Gets the maximum label length.
+   * Gets the title id.
    */
-  public int getMaxLabelLength() {
-    return Math.max(numberFormat.format(getMin()).length(), numberFormat.format(getMax()).length());
+  public int getTitleId(boolean metricUnits) {
+    return metricUnits ? metricTitleId : imperialTitleId;
+  }
+
+  /**
+   * Gets the title paint.
+   */
+  public Paint getTitlePaint() {
+    return titlePaint;
+  }
+
+  /**
+   * Gets the marker paint.
+   */
+  public Paint getMarkerPaint() {
+    return markerPaint;
+  }
+
+  /**
+   * Gets the largest marker.
+   */
+  public String getLargestMarker() {
+    String minMarker = numberFormat.format(getMinMarkerValue());
+    String maxMarker = numberFormat.format(getMaxMarkerValue());
+    return minMarker.length() >= maxMarker.length() ? minMarker : maxMarker;
+  }
+
+  /**
+   * Formats a marker value.
+   * 
+   * @param value the value
+   */
+  public String formatMarker(int value) {
+    return numberFormat.format(value);
   }
 }

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

@@ -15,7 +15,6 @@
  */
 package com.google.android.apps.mytracks;
 
-import com.google.android.apps.mytracks.ChartValueSeries.YAxisDimension;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.stats.ExtremityMonitor;
 import com.google.android.apps.mytracks.util.IntentUtils;
@@ -30,7 +29,6 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
-import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.drawable.Drawable;
@@ -50,6 +48,21 @@ import java.util.ArrayList;
  * @author Leif Hendrik Wilden
  */
 public class ChartView extends View {
+
+  public static final float LARGE_TEXT_SIZE = 22f;
+  public static final float MEDIUM_TEXT_SIZE = 18f;
+  public static final float SMALL_TEXT_SIZE = 14f;
+
+  public static final int Y_AXIS_INTERVALS = 5;
+
+  public static final int NUM_SERIES = 6;
+  public static final int ELEVATION_SERIES = 0;
+  public static final int SPEED_SERIES = 1;
+  public static final int PACE_SERIES = 2;
+  public static final int HEART_RATE_SERIES = 3;
+  public static final int CADENCE_SERIES = 4;
+  public static final int POWER_SERIES = 5;
+
   private static final int MIN_ZOOM_LEVEL = 1;
 
   /*
@@ -66,8 +79,6 @@ public class ChartView extends View {
   private int zoomLevel = 1;
   private int maxZoomLevel = 10;
 
-  private static final int MAX_INTERVALS = 5;
-
   /*
    * Borders, margins, dimensions (in pixels):
    */
@@ -109,15 +120,6 @@ public class ChartView extends View {
    */
   private double maxX = 1;
 
-  /**
-   * The various series.
-   */
-  public static final int ELEVATION_SERIES = 0;
-  public static final int SPEED_SERIES = 1;
-  public static final int POWER_SERIES = 2;
-  public static final int CADENCE_SERIES = 3;
-  public static final int HEART_RATE_SERIES = 4;
-  public static final int NUM_SERIES = 5;
   private ChartValueSeries[] series;
 
   private final ExtremityMonitor xMonitor = new ExtremityMonitor();
@@ -204,41 +206,54 @@ public class ChartView extends View {
     series = new ChartValueSeries[NUM_SERIES];
 
     // Create the value series.
-    series[ELEVATION_SERIES] =
-        new ChartValueSeries(context,
-                             R.color.elevation_fill,
-                             R.color.elevation_border,
-                             new YAxisDimension(MAX_INTERVALS, Integer.MIN_VALUE, Integer.MAX_VALUE,
-                                 new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}),
-                             R.string.stats_elevation);
-
-    series[SPEED_SERIES] =
-        new ChartValueSeries(context,
-                             R.color.speed_fill,
-                             R.color.speed_border,
-                             new YAxisDimension(MAX_INTERVALS, 0, Integer.MAX_VALUE,
-                                 new int[] {1, 5, 10, 20, 50}),
-                             R.string.stats_speed);
-    series[POWER_SERIES] =
-        new ChartValueSeries(context,
-                             R.color.power_fill,
-                             R.color.power_border,
-                             new YAxisDimension(MAX_INTERVALS, 0, 1000, new int[] {5, 50, 100, 200}),
-                             R.string.sensor_state_power);
-    series[CADENCE_SERIES] =
-        new ChartValueSeries(context,
-                             R.color.cadence_fill,
-                             R.color.cadence_border,
-                             new YAxisDimension(MAX_INTERVALS, 0, Integer.MAX_VALUE,
-                                 new int[] {5, 10, 25, 50}),
-                             R.string.sensor_state_cadence);
-    series[HEART_RATE_SERIES] =
-        new ChartValueSeries(context,
-                             R.color.heartrate_fill,
-                             R.color.heartrate_border,
-                             new YAxisDimension(MAX_INTERVALS, 0, Integer.MAX_VALUE,
-                                 new int[] {25, 50}),
-                             R.string.sensor_state_heart_rate);
+    series[ELEVATION_SERIES] = new ChartValueSeries(context,
+        Integer.MIN_VALUE,
+        Integer.MAX_VALUE,
+        new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000},
+        R.string.description_elevation_metric,
+        R.string.description_elevation_imperial,
+        R.color.elevation_fill,
+        R.color.elevation_border);
+    series[SPEED_SERIES] = new ChartValueSeries(context,
+        0,
+        Integer.MAX_VALUE,
+        new int[] {1, 5, 10, 20, 50},
+        R.string.description_speed_metric,
+        R.string.description_speed_imperial,
+        R.color.speed_fill,
+        R.color.speed_border);
+    series[PACE_SERIES] = new ChartValueSeries(context,
+        0,
+        Integer.MAX_VALUE,
+        new int[] { 1, 2, 5, 10, 15, 20, 30, 60, 120 },
+        R.string.description_pace_metric,
+        R.string.description_pace_imperial,
+        R.color.pace_fill,
+        R.color.pace_border);
+    series[HEART_RATE_SERIES] = new ChartValueSeries(context,
+        0,
+        Integer.MAX_VALUE,
+        new int[] {25, 50},
+        R.string.description_sensor_heart_rate,
+        R.string.description_sensor_heart_rate,
+        R.color.heartrate_fill,
+        R.color.heartrate_border);
+    series[CADENCE_SERIES] = new ChartValueSeries(context,
+        0,
+        Integer.MAX_VALUE,
+        new int[] {5, 10, 25, 50},
+        R.string.description_sensor_cadence,
+        R.string.description_sensor_cadence,
+        R.color.cadence_fill,
+        R.color.cadence_border);
+    series[POWER_SERIES] = new ChartValueSeries(context,
+        0,
+        1000,
+        new int[] {5, 50, 100, 200},
+        R.string.description_sensor_power,
+        R.string.description_sensor_power,
+        R.color.power_fill,
+        R.color.power_border);
   }
 
   public void clearWaypoints() {
@@ -263,12 +278,6 @@ public class ChartView extends View {
     this.metricUnits = metricUnits;
   }
 
-  public void setReportSpeed(boolean reportSpeed, Context c) {
-    series[SPEED_SERIES].setTitle(c.getString(reportSpeed
-                                              ? R.string.stats_speed
-                                              : R.string.stats_pace));
-  }
-
   private void addDataPointInternal(double[] theData) {
     xMonitor.update(theData[0]);
     int min = Math.min(series.length, theData.length - 1);
@@ -622,7 +631,8 @@ public class ChartView extends View {
     for (ChartValueSeries cvs : series) {
       if (cvs.isEnabled() && cvs.hasData()) {
         int x = (int) (w * (double) ++j / sections) + getScrollX();
-        c.drawText(cvs.getTitle(), x, topBorder, cvs.getLabelPaint());
+        c.drawText(
+            getContext().getString(cvs.getTitleId(metricUnits)), x, topBorder, cvs.getTitlePaint());
       }
     }
   }
@@ -719,7 +729,7 @@ public class ChartView extends View {
     int maxLength = 0;
     for (ChartValueSeries cvs : series) {
       if (cvs.isEnabled() && cvs.hasData()) {
-        maxLength += cvs.getMaxLabelLength();
+        maxLength += cvs.getLargestMarker().length();
       }
     }
     float density = getContext().getResources().getDisplayMetrics().density;
@@ -758,9 +768,9 @@ public class ChartView extends View {
   }
 
   private int getY(ChartValueSeries cvs, double y) {
-    int effectiveSpread = cvs.getInterval() * MAX_INTERVALS;
+    int effectiveSpread = cvs.getInterval() * Y_AXIS_INTERVALS;
     return topBorder + effectiveHeight
-        - (int) ((y - cvs.getMin()) * effectiveHeight / effectiveSpread);
+        - (int) ((y - cvs.getMinMarkerValue()) * effectiveHeight / effectiveSpread);
   }
 
   /** Draws the labels on the X axis into the given canvas. */
@@ -792,8 +802,8 @@ public class ChartView extends View {
   private float drawYLabels(ChartValueSeries cvs, Canvas c, int x) {
     int interval = cvs.getInterval();
     float maxTextWidth = 0;
-    for (int i = 0; i < MAX_INTERVALS; ++i) {
-      maxTextWidth = Math.max(maxTextWidth, drawYLabel(cvs, c, x, i * interval + cvs.getMin()));
+    for (int i = 0; i < Y_AXIS_INTERVALS; ++i) {
+      maxTextWidth = Math.max(maxTextWidth, drawYLabel(cvs, c, x, i * interval + cvs.getMinMarkerValue()));
     }
     return maxTextWidth;
   }
@@ -814,14 +824,13 @@ public class ChartView extends View {
 
   /** Draws a single label on the Y axis. */
   private float drawYLabel(ChartValueSeries cvs, Canvas c, int x, int y) {
-    int desiredY = (int) ((y - cvs.getMin()) * effectiveHeight /
-        (cvs.getInterval() * MAX_INTERVALS));
+    int desiredY = (int) ((y - cvs.getMinMarkerValue()) * effectiveHeight /
+        (cvs.getInterval() * Y_AXIS_INTERVALS));
     desiredY = topBorder + effectiveHeight + FONT_HEIGHT / 2 - desiredY - 1;
-    Paint p = new Paint(cvs.getLabelPaint());
-    p.setTextAlign(Align.RIGHT);
-    String text = cvs.getNumberFormat().format(y);
-    c.drawText(text, x, desiredY, p);
-    return p.measureText(text);
+    Paint markerPaint = cvs.getMarkerPaint();
+    String text = cvs.formatMarker(y);
+    c.drawText(text, x, desiredY, markerPaint);
+    return markerPaint.measureText(text);
   }
 
   /** Draws the actual X axis line and its label. */
@@ -844,8 +853,8 @@ public class ChartView extends View {
     canvas.drawLine(leftBorder, UNIT_BORDER + topBorder,
                     leftBorder, effectiveHeight + topBorder,
                     borderPaint);
-    for (int i = 1; i < MAX_INTERVALS; ++i) {
-      int y = i * effectiveHeight / MAX_INTERVALS + topBorder;
+    for (int i = 1; i < Y_AXIS_INTERVALS; ++i) {
+      int y = i * effectiveHeight / Y_AXIS_INTERVALS + topBorder;
       canvas.drawLine(leftBorder - 5, y, leftBorder, y, gridPaint);
     }
 
@@ -858,8 +867,8 @@ public class ChartView extends View {
   /** Draws the grid for the graph. */
   private void drawGrid(Canvas c) {
     float rightEdge = getX(maxX);
-    for (int i = 1; i < MAX_INTERVALS; ++i) {
-      int y = i * effectiveHeight / MAX_INTERVALS + topBorder;
+    for (int i = 1; i < Y_AXIS_INTERVALS; ++i) {
+      int y = i * effectiveHeight / Y_AXIS_INTERVALS + topBorder;
       c.drawLine(leftBorder, y, rightEdge, y, gridBarPaint);
     }
   }

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

@@ -77,15 +77,15 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   private boolean reportSpeed = true;
 
   private boolean chartByDistance = true;
-  private boolean[] chartShow = new boolean[] {true, true, true, true, true};
+  private boolean[] chartShow = new boolean[] {true, true, true, true, true, true};
 
   // UI elements
   private ChartView chartView;
   private ZoomControls zoomControls;
 
   /**
-   * A runnable that will remove the spinner (if any), enable/disable zoom
-   * controls and orange pointer as appropriate and redraw.
+   * A runnable that will enable/disable zoom controls and orange pointer as
+   * appropriate and redraw.
    */
   private final Runnable updateChart = new Runnable() {
     @Override
@@ -215,7 +215,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   @Override
   public void onNewTrackPoint(Location location) {
     if (LocationUtils.isValidLocation(location)) {
-      double[] data = new double[6];
+      double[] data = new double[ChartView.NUM_SERIES + 1];
       fillDataPoint(location, data);
       pendingPoints.add(data);
     }
@@ -280,7 +280,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
       return false;
     }
     reportSpeed = speed;
-    chartView.setReportSpeed(speed, getActivity());
+    setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed);
+    setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed);
     getActivity().runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -310,6 +311,10 @@ public class ChartFragment extends Fragment implements TrackDataListener {
         getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT))) {
       needUpdate = true;
     }
+    if (setSeriesEnabled(ChartView.PACE_SERIES, !PreferencesUtils.getBoolean(
+        getActivity(), R.string.chart_show_speed_key, PreferencesUtils.CHART_SHOW_SPEED_DEFAULT))) {
+      needUpdate = true;
+    }
     if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.getBoolean(
         getActivity(), R.string.chart_show_power_key, PreferencesUtils.CHART_SHOW_POWER_DEFAULT))) {
       needUpdate = true;
@@ -405,13 +410,14 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
   
   /**
-   * Given a location, fill in a data point, an array of double[6]. <br>
+   * Given a location, fill in a data point, an array of double[]. <br>
    * data[0] = time/distance <br>
    * data[1] = elevation <br>
    * data[2] = speed <br>
-   * data[3] = power <br>
-   * data[4] = cadence <br>
-   * data[5] = heart rate <br>
+   * data[3] = pace <br>
+   * data[4] = heart rate <br>
+   * data[5] = cadence <br>
+   * data[6] = power <br>
    * 
    * @param location the location
    * @param data the data point to fill in, can be null
@@ -421,9 +427,10 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     double timeOrDistance = Double.NaN;
     double elevation = Double.NaN;
     double speed = Double.NaN;
-    double power = Double.NaN;
+    double pace = Double.NaN;
+    double heartRate = Double.NaN;
     double cadence = Double.NaN;
-    double heartRate = Double.NaN;  
+    double power = Double.NaN;
    
     // TODO: Use TripStatisticsBuilder
     if (chartByDistance) {
@@ -460,36 +467,36 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     if (!metricUnits) {
       speed *= UnitConversions.KM_TO_MI;
     }
-    if (!reportSpeed) {
-      speed = speed == 0 ? 0.0 : 60.0 / speed;
-    }
-  
+    pace = speed == 0 ? 0.0 : 60.0 / speed;
+
     if (location instanceof MyTracksLocation
         && ((MyTracksLocation) location).getSensorDataSet() != null) {
       SensorDataSet sensorDataSet = ((MyTracksLocation) location).getSensorDataSet();
-      if (sensorDataSet.hasPower() && sensorDataSet.getPower().getState() == Sensor.SensorState.SENDING
-          && sensorDataSet.getPower().hasValue()) {
-        power = sensorDataSet.getPower().getValue();
+      if (sensorDataSet.hasHeartRate()
+          && sensorDataSet.getHeartRate().getState() == Sensor.SensorState.SENDING
+          && sensorDataSet.getHeartRate().hasValue()) {
+        heartRate = sensorDataSet.getHeartRate().getValue();
       }
       if (sensorDataSet.hasCadence()
           && sensorDataSet.getCadence().getState() == Sensor.SensorState.SENDING
           && sensorDataSet.getCadence().hasValue()) {
         cadence = sensorDataSet.getCadence().getValue();
       }
-      if (sensorDataSet.hasHeartRate()
-          && sensorDataSet.getHeartRate().getState() == Sensor.SensorState.SENDING
-          && sensorDataSet.getHeartRate().hasValue()) {
-        heartRate = sensorDataSet.getHeartRate().getValue();
+      if (sensorDataSet.hasPower()
+          && sensorDataSet.getPower().getState() == Sensor.SensorState.SENDING
+          && sensorDataSet.getPower().hasValue()) {
+        power = sensorDataSet.getPower().getValue();
       }
     }
-    
+
     if (data != null) {
       data[0] = timeOrDistance;
       data[1] = elevation;
       data[2] = speed;
-      data[3] = power;
-      data[4] = cadence;
-      data[5] = heartRate;
+      data[3] = pace;
+      data[4] = heartRate;
+      data[5] = cadence;
+      data[6] = power;
     }
     lastLocation = location;
   }

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java

@@ -44,7 +44,8 @@ import android.widget.TextView;
 public class UploadResultActivity extends FragmentActivity {
 
   private static final String TAG = UploadResultActivity.class.getSimpleName();
-  private static final int DIALOG_RESULT_ID = 0;
+  @VisibleForTesting
+  static final int DIALOG_RESULT_ID = 0;
 
   private SendRequest sendRequest;
   private String shareUrl;

MyTracks/src/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java

@@ -71,11 +71,9 @@ public class StatsSettingsActivity extends AbstractSettingsActivity {
         getString(R.string.report_speed_key));
     boolean metric = PreferencesUtils.getBoolean(
         this, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
-    reportSpeedCheckBoxPreference.setSummaryOn(
-        metric ? getString(R.string.settings_stats_rate_speed_metric)
-            : getString(R.string.settings_stats_rate_speed_imperial));
-    reportSpeedCheckBoxPreference.setSummaryOff(
-        metric ? getString(R.string.settings_stats_rate_pace_metric)
-            : getString(R.string.settings_stats_rate_pace_imperial));
+    reportSpeedCheckBoxPreference.setSummaryOn(metric ? getString(R.string.description_speed_metric)
+        : getString(R.string.description_speed_imperial));
+    reportSpeedCheckBoxPreference.setSummaryOff(metric ? getString(R.string.description_pace_metric)
+        : getString(R.string.description_pace_imperial));
   }
 }