Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

init

Browse source
This commit is contained in:
sergosm 2020-10-12 18:26:43 +03:00
parent b7520a5134
commit a09194402b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -11,6 +11,7 @@
Thx - Hardy Thx - Hardy
--> -->
<string name="use_two_phase_routing">Use 2-phase A* routing algorithm</string>
<string name="file_already_imported">File is already imported in OsmAnd</string> <string name="file_already_imported">File is already imported in OsmAnd</string>
<string name="osm_edit_logout_success">Logout successful</string> <string name="osm_edit_logout_success">Logout successful</string>
<string name="clear_osm_token">Clear OpenStreetMap OAuth token</string> <string name="clear_osm_token">Clear OpenStreetMap OAuth token</string>
@ -20,7 +21,6 @@
<string name="use_native_pt">Native Public Transport development</string> <string name="use_native_pt">Native Public Transport development</string>
<string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string> <string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string>
<string name="complex_routing_descr">Two-phase routing for car navigation.</string> <string name="complex_routing_descr">Two-phase routing for car navigation.</string>
<string name="use_complex_routing">Complex routing</string>
<string name="use_live_routing">OsmAnd Live data</string> <string name="use_live_routing">OsmAnd Live data</string>
<string name="use_live_public_transport">OsmAnd Live data</string> <string name="use_live_public_transport">OsmAnd Live data</string>
<string name="development">Development</string> <string name="development">Development</string>

5
OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -162,6 +162,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description)); useOsmLiveForPublicTransport.setDescription(getString(R.string.use_osm_live_public_transport_description));
useOsmLiveForPublicTransport.setSummaryOn(R.string.shared_string_enabled); useOsmLiveForPublicTransport.setSummaryOn(R.string.shared_string_enabled);
useOsmLiveForPublicTransport.setSummaryOff(R.string.shared_string_disabled); useOsmLiveForPublicTransport.setSummaryOff(R.string.shared_string_disabled);
useOsmLiveForPublicTransport.setIcon(getContentIcon(R.drawable.ic_action_osm_live));
useOsmLiveForPublicTransport.setIconSpaceReserved(true); useOsmLiveForPublicTransport.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useOsmLiveForPublicTransport); getPreferenceScreen().addPreference(useOsmLiveForPublicTransport);
} }
@ -184,13 +185,14 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description)); useOsmLiveForRouting.setDescription(getString(R.string.use_osm_live_routing_description));
useOsmLiveForRouting.setSummaryOn(R.string.shared_string_enabled); useOsmLiveForRouting.setSummaryOn(R.string.shared_string_enabled);
useOsmLiveForRouting.setSummaryOff(R.string.shared_string_disabled); useOsmLiveForRouting.setSummaryOff(R.string.shared_string_disabled);
useOsmLiveForRouting.setIcon(getContentIcon(R.drawable.ic_action_osm_live));
useOsmLiveForRouting.setIconSpaceReserved(true); useOsmLiveForRouting.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useOsmLiveForRouting); getPreferenceScreen().addPreference(useOsmLiveForRouting);
} }
private void setupDisableComplexRoutingPref() { private void setupDisableComplexRoutingPref() {
SwitchPreferenceEx disableComplexRouting = createSwitchPreferenceEx(settings.DISABLE_COMPLEX_ROUTING.getId(), SwitchPreferenceEx disableComplexRouting = createSwitchPreferenceEx(settings.DISABLE_COMPLEX_ROUTING.getId(),
R.string.use_complex_routing, R.layout.preference_with_descr_dialog_and_switch); R.string.use_two_phase_routing, R.layout.preference_with_descr_dialog_and_switch);
disableComplexRouting.setDescription(getString(R.string.complex_routing_descr)); disableComplexRouting.setDescription(getString(R.string.complex_routing_descr));
disableComplexRouting.setSummaryOn(R.string.shared_string_enabled); disableComplexRouting.setSummaryOn(R.string.shared_string_enabled);
disableComplexRouting.setSummaryOff(R.string.shared_string_disabled); disableComplexRouting.setSummaryOff(R.string.shared_string_disabled);
@ -204,6 +206,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc)); useFastRecalculation.setDescription(getString(R.string.use_fast_recalculation_desc));
useFastRecalculation.setSummaryOn(R.string.shared_string_enabled); useFastRecalculation.setSummaryOn(R.string.shared_string_enabled);
useFastRecalculation.setSummaryOff(R.string.shared_string_disabled); useFastRecalculation.setSummaryOff(R.string.shared_string_disabled);
useFastRecalculation.setIcon(getContentIcon(R.drawable.ic_action_route_part));
useFastRecalculation.setIconSpaceReserved(true); useFastRecalculation.setIconSpaceReserved(true);
getPreferenceScreen().addPreference(useFastRecalculation); getPreferenceScreen().addPreference(useFastRecalculation);
} }