am f85d9841: Merge "Fix elapsed time formatting."

* commit 'f85d9841f8e198de656973a2102d3239e628390a':
  Fix elapsed time formatting.
This commit is contained in:
Elliott Hughes
2014-01-03 13:36:27 -08:00
committed by Android Git Automerger

View File

@@ -44,15 +44,15 @@ public class Utils {
} }
int days = 0, hours = 0, minutes = 0; int days = 0, hours = 0, minutes = 0;
if (seconds > SECONDS_PER_DAY) { if (seconds >= SECONDS_PER_DAY) {
days = seconds / SECONDS_PER_DAY; days = seconds / SECONDS_PER_DAY;
seconds -= days * SECONDS_PER_DAY; seconds -= days * SECONDS_PER_DAY;
} }
if (seconds > SECONDS_PER_HOUR) { if (seconds >= SECONDS_PER_HOUR) {
hours = seconds / SECONDS_PER_HOUR; hours = seconds / SECONDS_PER_HOUR;
seconds -= hours * SECONDS_PER_HOUR; seconds -= hours * SECONDS_PER_HOUR;
} }
if (seconds > SECONDS_PER_MINUTE) { if (seconds >= SECONDS_PER_MINUTE) {
minutes = seconds / SECONDS_PER_MINUTE; minutes = seconds / SECONDS_PER_MINUTE;
seconds -= minutes * SECONDS_PER_MINUTE; seconds -= minutes * SECONDS_PER_MINUTE;
} }