Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-07-29 10:57:44 +02:00
commit c26d524e1c

View file

@ -576,7 +576,12 @@ public class SplitSegmentFragment extends OsmAndListFragment {
String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app);
String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app);
String maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
String maxMinSpeed;
if (maxSpeed.contains(" ")) {
maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed);
} else {
maxMinSpeed = maxSpeed.substring(0, maxSpeed.indexOf("-")).concat("/").concat(minSpeed);
}
if (minMaxSpeedLayoutWidth == 0) {
DisplayMetrics metrics = new DisplayMetrics();