Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-02-28 14:33:47 +01:00
commit 09eb260bd9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -314,6 +314,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
onItemsSwapped(stableAdapter.getActiveObjects());
} else if (visibleType == DashboardType.MAP_MARKERS || visibleType == DashboardType.MAP_MARKERS_SELECTION) {
updateMapMarkers(stableAdapter.getActiveObjects());
reloadAdapter();
}
if (stableAdapter.getActiveObjects().size() == 0) {
hideDashboard();
@ -321,10 +322,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
mapActivity.getMapActions().stopNavigationWithoutConfirm();
mapActivity.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().hide();
}
} else {
if (visibleType == DashboardType.MAP_MARKERS || visibleType == DashboardType.MAP_MARKERS_SELECTION) {
reloadAdapter();
}
//} else {
// if (visibleType == DashboardType.MAP_MARKERS || visibleType == DashboardType.MAP_MARKERS_SELECTION) {
// reloadAdapter();
// }
}
}
}