Revert fix of using compass

This commit is contained in:
Victor Shcherb 2012-09-11 23:51:09 +02:00
parent c939ffecc7
commit 5fccc507e9
2 changed files with 2 additions and 3 deletions

View file

@ -1215,8 +1215,7 @@ public class OsmandSettings {
//public final OsmandPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); //public final OsmandPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache();
public final CommonPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache(); public final CommonPreference<Boolean> USE_COMPASS_IN_NAVIGATION = new BooleanPreference("use_compass_navigation", true).makeProfile().cache();
{ {
//Issue 1346 USE_COMPASS_IN_NAVIGATION.setModeDefaultValue(ApplicationMode.CAR, true);
USE_COMPASS_IN_NAVIGATION.setModeDefaultValue(ApplicationMode.CAR, false);
} }
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name

View file

@ -467,7 +467,7 @@ public class RouteInfoControls {
boolean visible = false; boolean visible = false;
int locimminent = -1; int locimminent = -1;
int[] loclanes = null; int[] loclanes = null;
if (routingHelper != null && routingHelper.isRouteCalculated()) { if (routingHelper != null && routingHelper.isRouteCalculated() && view.getSettings().SHOW_LANES.get()) {
if (routingHelper.isFollowingMode()) { if (routingHelper.isFollowingMode()) {
NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), false); NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(new NextDirectionInfo(), false);
if(r != null && r.directionInfo != null && r.directionInfo.getTurnType() != null) { if(r != null && r.directionInfo != null && r.directionInfo.getTurnType() != null) {