diff --git a/OsmAnd/libs/armeabi/libosmand.so b/OsmAnd/libs/armeabi/libosmand.so index f7a0af4d48..1f364fcadd 100755 Binary files a/OsmAnd/libs/armeabi/libosmand.so and b/OsmAnd/libs/armeabi/libosmand.so differ diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index f269c59d10..231fd2bbb1 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1,10 +1,9 @@  + Показывать уровень приближения вместо масштаба. + Показывать уровень приближения. Выбор точки назначения -\tNEW VERSION, PLEASE ADAPT TRANSLATION: You can select a destination directly in the map (context menu, then \'Set as destination\'), in all search activities, or via long pressing an entry in your \'List of Favorite Points\'. -\n\tThe destination is marked as an orange disk on the map and OsmAnd displays the distance to it and the direction to it (orange triangle). - \n\tВы можете выбрать точку назначения в контекстном меню карты \'Идти к\' или в поиске. \n\tВы также можете выбрать избранную точку долгим нажатием в \'Избранных\'. diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 1fa3afdc7b..5a60853c39 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1,5 +1,7 @@ + Show zoom level constantly instead of ruler. + Show zoom level Select Destination \tYou can select a destination directly in the map (context menu, then \'Set as destination\'), in all search activities, or via long pressing an entry in your \'List of Favorite Points\'. \n\tThe destination is marked as an orange disk on the map and OsmAnd displays the distance to it and the direction to it (orange triangle). diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml index 13d374b984..cd3835a300 100644 --- a/OsmAnd/res/xml/settings_pref.xml +++ b/OsmAnd/res/xml/settings_pref.xml @@ -90,6 +90,7 @@ + diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index f8d106e167..0d75f1b45c 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -271,7 +271,7 @@ public class OsmandSettings { } private BooleanPreference(String id, boolean defaultValue, boolean global, boolean cache) { - super(id, global, cache); + super(id, global, cache, defaultValue); } @Override @@ -1061,7 +1061,12 @@ public class OsmandSettings { } public final CommonPreference SHOW_ALTITUDE_INFO = - new BooleanPreference("show_altitude_info", false, false); + new BooleanPreference("show_altitude_info", false, false, true); + + public final CommonPreference SHOW_ZOOM_LEVEL = + new BooleanPreference("show_zoom_level", false, false, true); + + public enum DayNightMode { AUTO(R.string.daynight_mode_auto), diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 2f95e10c53..7504389025 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -832,12 +832,6 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso if (LocationProvider.OUT_OF_SERVICE == status) { // do not use it in routing if (service.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) { -// try { -// service.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, GPS_TIMEOUT_REQUEST, GPS_DIST_REQUEST, -// networkListener); -// } catch (IllegalArgumentException e) { -// Log.d(LogUtil.TAG, "Network location provider not available"); //$NON-NLS-1$ -// } } } else if (LocationProvider.AVAILABLE == status) { // Do not remove right now network listener diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java index b1c52c4632..699bf26e97 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java @@ -176,6 +176,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference registerBooleanPreference(osmandSettings.TEST_ANIMATE_ROUTING,screen); registerBooleanPreference(osmandSettings.NATIVE_RENDERING,screen); registerBooleanPreference(osmandSettings.SHOW_ALTITUDE_INFO,screen); + registerBooleanPreference(osmandSettings.SHOW_ZOOM_LEVEL,screen); + registerEditTextPreference(osmandSettings.USER_NAME, screen); registerEditTextPreference(osmandSettings.USER_PASSWORD, screen); diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java index 9e50b0189e..610823a0bd 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java @@ -124,7 +124,7 @@ public class MapControlsLayer extends OsmandMapLayer { hideZoomLevelInTime(); } } - if (showZoomLevel) { + if (showZoomLevel || view.getSettings().SHOW_ZOOM_LEVEL.get()) { drawZoomLevel(canvas); } else { drawRuler(canvas); diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index 8c670ff8dc..774ec33c26 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -548,7 +548,7 @@ public class MapInfoLayer extends OsmandMapLayer { // Back to location icon params = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); params.leftMargin = (int) (10 * scaleCoefficient); - params.rightMargin = (int) (1 * scaleCoefficient); + params.rightMargin = 0; backToLocation = new ImageView(view.getContext()); backToLocation.setImageDrawable(view.getResources().getDrawable(R.drawable.back_to_loc)); backToLocation.setOnClickListener(new View.OnClickListener() {