merge heads

This commit is contained in:
Jimmy Shih
2012-01-04 17:17:41 -08:00
parent 8db6f5b569
commit 23ca7bd05e
12 changed files with 56 additions and 120 deletions
@@ -805,7 +805,7 @@ public class ChartView extends View {
String s =
(mode == Mode.BY_DISTANCE)
? (shortFormat ? X_SHORT_FORMAT.format(x) : X_FORMAT.format(x))
: StringUtils.formatTime((long) x);
: StringUtils.formatElapsedTime((long) x);
c.drawText(s,
getX(x),
effectiveHeight + UNIT_BORDER + topBorder,