Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch

This commit is contained in:
Alex 2017-10-12 12:47:47 +03:00
commit ff3d55dcb8

View file

@ -271,7 +271,7 @@ public class MapMarkersWidgetsFactory {
if (txt != null) { if (txt != null) {
distText.setText(txt); distText.setText(txt);
} }
// updateVisibility(okButton, !customLocation && loc != null && dist < MIN_DIST_OK_VISIBLE); updateVisibility(okButton, !customLocation && loc != null && dist < MIN_DIST_OK_VISIBLE);
String descr; String descr;
PointDescription pd = marker.getPointDescription(map); PointDescription pd = marker.getPointDescription(map);