Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-21 11:13:33 +02:00
commit 80a5235b3d
2 changed files with 1 additions and 3 deletions

View file

@ -31,7 +31,6 @@ import net.osmand.Location;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.data.Amenity;
import net.osmand.data.Building;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;

View file

@ -538,7 +538,7 @@ public class MapControlsLayer extends OsmandMapLayer {
mapZoomIn.updateVisibility(!dialogOpened);
mapZoomOut.updateVisibility(!dialogOpened);
compassHud.updateVisibility(!dialogOpened && cachedRotate != 0);
compassHud.updateVisibility(!dialogOpened);
layersHud.updateVisibility(!dialogOpened);
quickSearch.updateVisibility(!dialogOpened);
@ -584,7 +584,6 @@ public class MapControlsLayer extends OsmandMapLayer {
compassHud.setIconResId(isNight ? R.drawable.map_compass_white : R.drawable.map_compass);
compassHud.iv.setContentDescription(mapActivity.getString(R.string.rotate_map_compass_opt));
}
compassHud.updateVisibility(cachedRotate != 0);
}
private void updateMyLocation(RoutingHelper rh, boolean dialogOpened) {