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

Fix - Street name could not be together with top bar

Browse source
This commit is contained in:
Alexey Kulish 2016-02-22 10:07:22 +03:00
parent e7d9d4384a
commit 8fda5674c9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapMarkersWidgetsFactory.java
View file

@ -37,6 +37,7 @@ public class MapMarkersWidgetsFactory {
private boolean largeDevice; private boolean largeDevice;
private View topBar; private View topBar;
private View addressTopBar;
private View topBar2nd; private View topBar2nd;
private View rowView; private View rowView;
private View rowView2nd; private View rowView2nd;
@ -63,6 +64,7 @@ public class MapMarkersWidgetsFactory {
portraitMode = AndroidUiHelper.isOrientationPortrait(map); portraitMode = AndroidUiHelper.isOrientationPortrait(map);
largeDevice = AndroidUiHelper.isXLargeDevice(map); largeDevice = AndroidUiHelper.isXLargeDevice(map);
addressTopBar = map.findViewById(R.id.map_top_bar);
topBar = map.findViewById(R.id.map_markers_top_bar); topBar = map.findViewById(R.id.map_markers_top_bar);
topBar2nd = map.findViewById(R.id.map_markers_top_bar_2nd); topBar2nd = map.findViewById(R.id.map_markers_top_bar_2nd);
rowView = map.findViewById(R.id.map_marker_row); rowView = map.findViewById(R.id.map_marker_row);
@ -180,7 +182,8 @@ public class MapMarkersWidgetsFactory {
|| !map.getMyApplication().getSettings().SHOW_MAP_MARKERS_TOOLBAR.get() || !map.getMyApplication().getSettings().SHOW_MAP_MARKERS_TOOLBAR.get()
|| map.getMyApplication().getRoutingHelper().isFollowingMode() || map.getMyApplication().getRoutingHelper().isFollowingMode()
|| map.getMyApplication().getRoutingHelper().isRoutePlanningMode() || map.getMyApplication().getRoutingHelper().isRoutePlanningMode()
|| map.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().isVisible()) { || map.getMapLayers().getMapControlsLayer().getMapRouteInfoMenu().isVisible()
|| addressTopBar.getVisibility() == View.VISIBLE) {
updateVisibility(false); updateVisibility(false);
return; return;
} }