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 2014-08-29 21:02:44 +02:00
commit 9f80713498
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -265,8 +265,8 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
} }
public void switchRotateMapMode(){ public void switchRotateMapMode(){
//TODO: Display Toast R.string.rotate_map_to_bearing + ":\n" + R.string.rotate_map_none_opt //int resId = R.string.rotate_map_none_opt;
int resId = R.string.rotate_map_none_opt; String rotMode = R.string.rotate_map_none_opt;
if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE && mapView.getRotate() != 0) { if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE && mapView.getRotate() != 0) {
// reset manual rotation // reset manual rotation
} else { } else {
@ -274,12 +274,16 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
settings.ROTATE_MAP.set(vl); settings.ROTATE_MAP.set(vl);
if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS) { if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS) {
resId = R.string.rotate_map_compass_opt; //resId = R.string.rotate_map_compass_opt;
rotMode = R.string.rotate_map_compass_opt;
} else if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) { } else if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
resId = R.string.rotate_map_bearing_opt; //resId = R.string.rotate_map_bearing_opt;
rotMode = R.string.rotate_map_bearing_opt;
} }
} }
app.showShortToastMessage(resId); //app.showShortToastMessage(resId);
rotMode = R.string.rotate_map_to_bearing + ":\n" + rotMode;
app.showToastMessage(rotMode);
updateSettings(); updateSettings();
if(mapView != null) { if(mapView != null) {
mapView.refreshMap(); mapView.refreshMap();