Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-10 22:07:18 +01:00
commit d217e373ea

View file

@ -493,7 +493,7 @@ public class MapControlsLayer extends OsmandMapLayer {
updateMyLocation(rh, dialogOpened);
boolean showButtons = (showRouteCalculationControls || !routeFollowingMode);
//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
if ((routePlanningMode || routeFollowingMode) && mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() != null) {
if (routePlanningMode || routeFollowingMode) {
routePlanningBtn.setIconResId(R.drawable.map_start_navigation);
routePlanningBtn.setIconColorId(R.color.color_myloc_distance);
} else {
@ -508,7 +508,7 @@ public class MapControlsLayer extends OsmandMapLayer {
compassHud.updateVisibility(!dialogOpened);
layersHud.updateVisibility(!dialogOpened);
if ((routePlanningMode || routeFollowingMode) && mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() != null) {
if (routePlanningMode || routeFollowingMode) {
mapAppModeShadow.setVisibility(View.GONE);
} else {
if (mapView.isZooming()) {