Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-03-12 10:38:08 +01:00
commit 3d7baaf839

View file

@ -1373,6 +1373,9 @@ public class GpxUiHelper {
} }
if (values == null) { if (values == null) {
if (useRightAxis) {
yAxis.setEnabled(false);
}
return null; return null;
} }
@ -1398,6 +1401,9 @@ public class GpxUiHelper {
double SLOPE_PROXIMITY = 150; double SLOPE_PROXIMITY = 150;
if (totalDistance - SLOPE_PROXIMITY < 0) { if (totalDistance - SLOPE_PROXIMITY < 0) {
if (useRightAxis) {
yAxis.setEnabled(false);
}
return null; return null;
} }