From a13085c06cd65fe24ac2284fd7a6f0156cd42760 Mon Sep 17 00:00:00 2001 From: Alexander Sytnyk Date: Fri, 21 Jul 2017 15:09:51 +0300 Subject: [PATCH] Fix #3674; fix text in mapillary widget --- OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java | 3 ++- OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java index 832784ccb8..dbb6c3cb02 100644 --- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java +++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java @@ -199,7 +199,8 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc showViewAngle = routePlanningMode; // disable compass rotation in that mode } registerUnregisterSensor(location); - if (settings.ANIMATE_MY_LOCATION.get() && !smallSpeedForAnimation && !movingToMyLocation) { + if (settings.ANIMATE_MY_LOCATION.get() && !smallSpeedForAnimation && !movingToMyLocation && + settings.WAKE_ON_VOICE_INT.get() == 0) { mapView.getAnimatedDraggingThread().startMoving( location.getLatitude(), location.getLongitude(), zoom, rotation, false); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java index 9cfd80507e..1eb7d18913 100644 --- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java +++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java @@ -189,7 +189,7 @@ public class MapillaryPlugin extends OsmandPlugin { private TextInfoWidget createMonitoringControl(final MapActivity map) { mapillaryControl = new TextInfoWidget(map); - mapillaryControl.setText("", map.getString(R.string.mapillary)); + mapillaryControl.setText(map.getString(R.string.mapillary), ""); mapillaryControl.setIcons(R.drawable.widget_mapillary_day, R.drawable.widget_mapillary_night); mapillaryControl.setOnClickListener(new View.OnClickListener() { @Override