Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-07-18 17:48:04 +02:00
commit 1d42e6c10b

View file

@ -132,7 +132,7 @@ public class OsmAndFormatter {
return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h); return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h);
} else { } else {
float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE; float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE;
if (mph >= 10) { if (mph >= 10 || am.hasFastSpeed()) {
return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour); return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour);
} else { } else {
int mph10 = (int) Math.round(mph * 10f); int mph10 = (int) Math.round(mph * 10f);