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-07-21 10:18:44 +02:00
commit d395012b68
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -538,7 +538,7 @@ public class MapControlsLayer extends OsmandMapLayer {
mapZoomIn.updateVisibility(!dialogOpened); mapZoomIn.updateVisibility(!dialogOpened);
mapZoomOut.updateVisibility(!dialogOpened); mapZoomOut.updateVisibility(!dialogOpened);
compassHud.updateVisibility(!dialogOpened); compassHud.updateVisibility(!dialogOpened && cachedRotate != 0);
layersHud.updateVisibility(!dialogOpened); layersHud.updateVisibility(!dialogOpened);
quickSearch.updateVisibility(!dialogOpened); quickSearch.updateVisibility(!dialogOpened);
@ -571,7 +571,7 @@ public class MapControlsLayer extends OsmandMapLayer {
float mapRotate = mapActivity.getMapView().getRotate(); float mapRotate = mapActivity.getMapView().getRotate();
if (mapRotate != cachedRotate) { if (mapRotate != cachedRotate) {
cachedRotate = mapRotate; cachedRotate = mapRotate;
// Aply animation to image view // Apply animation to image view
compassHud.iv.invalidate(); compassHud.iv.invalidate();
} }
if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) { if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE) {
@ -584,6 +584,7 @@ public class MapControlsLayer extends OsmandMapLayer {
compassHud.setIconResId(isNight ? R.drawable.map_compass_white : R.drawable.map_compass); compassHud.setIconResId(isNight ? R.drawable.map_compass_white : R.drawable.map_compass);
compassHud.iv.setContentDescription(mapActivity.getString(R.string.rotate_map_compass_opt)); compassHud.iv.setContentDescription(mapActivity.getString(R.string.rotate_map_compass_opt));
} }
compassHud.updateVisibility(cachedRotate != 0);
} }
private void updateMyLocation(RoutingHelper rh, boolean dialogOpened) { private void updateMyLocation(RoutingHelper rh, boolean dialogOpened) {