Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-10-31 09:40:23 +01:00
commit 6eead694cb
2 changed files with 3 additions and 3 deletions

View file

@ -38,7 +38,7 @@
<string name="rendering_attr_contourColorScheme_description">Contour lines color scheme</string>
<string name="save_track_min_speed">Logging minimum speed</string>
<string name="save_track_min_speed_descr">Set minimum speed for a point to be logged</string>
<string name="save_track_min_distance">Logging minimum distance</string>
<string name="save_track_min_distance">Logging motion detection</string>
<string name="save_track_min_distance_descr">Set minimum distance from last position for point to be logged</string>
<string name="save_track_precision">Logging minimum precision</string>
<string name="save_track_precision_descr">Set minimum precision for a point to be logged</string>

View file

@ -1065,8 +1065,8 @@ public class OsmandSettings {
}
public final CommonPreference<Float> SAVE_TRACK_MIN_SPEED = new FloatPreference("save_track_min_speed", 0.f).makeProfile();
{
SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.CAR, 5.f);
SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.BICYCLE, 4.f);
// SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.CAR, 5.f);
// SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.BICYCLE, 4.f);
// SAVE_TRACK_MIN_SPEED.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 2.f);
}
public final CommonPreference<Float> SAVE_TRACK_MIN_DISTANCE = new FloatPreference("save_track_min_distance", 5).makeProfile();