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

Show preference

Browse source
This commit is contained in:
Victor Shcherb 2013-02-19 17:44:13 +01:00
parent b756ec829f
commit a6460c5479
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,9 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="prefer_motorways">Prefer motorways</string>
<string name="prefer_in_routing_title">Prefer&#8230;</string>
<string name="prefer_in_routing_descr">Prefer motorways</string>
<string name="tip_recent_changes_1_2_t">Changes in 1.2: <string name="tip_recent_changes_1_2_t">Changes in 1.2:
</string> </string>
<string name="max_speed_none">none</string> <string name="max_speed_none">none</string>

1
OsmAnd/res/xml/settings_pref.xml
View file

@ -34,6 +34,7 @@
<CheckBoxPreference android:title="@string/snap_to_road" android:summary="@string/snap_to_road_descr" android:key="snap_to_road"></CheckBoxPreference> <CheckBoxPreference android:title="@string/snap_to_road" android:summary="@string/snap_to_road_descr" android:key="snap_to_road"></CheckBoxPreference>
<Preference android:title="@string/show_warnings_title" android:summary="@string/show_warnings_descr" android:key="show_routing_alarms"/> <Preference android:title="@string/show_warnings_title" android:summary="@string/show_warnings_descr" android:key="show_routing_alarms"/>
<Preference android:title="@string/avoid_in_routing_title" android:summary="@string/avoid_in_routing_descr" android:key="avoid_in_routing"/> <Preference android:title="@string/avoid_in_routing_title" android:summary="@string/avoid_in_routing_descr" android:key="avoid_in_routing"/>
<Preference android:title="@string/prefer_in_routing_title" android:summary="@string/prefer_in_routing_descr" android:key="prefer_in_routing"/>
<CheckBoxPreference android:summary="@string/use_compass_navigation_descr" android:title="@string/use_compass_navigation" <CheckBoxPreference android:summary="@string/use_compass_navigation_descr" android:title="@string/use_compass_navigation"
android:key="use_compass_navigation"></CheckBoxPreference> android:key="use_compass_navigation"></CheckBoxPreference>
<CheckBoxPreference android:summary="@string/precise_routing_mode_descr" android:title="@string/precise_routing_mode" <CheckBoxPreference android:summary="@string/precise_routing_mode_descr" android:title="@string/precise_routing_mode"

8
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -70,6 +70,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
private Preference bidforfix; private Preference bidforfix;
private Preference plugins; private Preference plugins;
private Preference avoidRouting; private Preference avoidRouting;
private Preference preferRouting;
private Preference showAlarms; private Preference showAlarms;
private EditTextPreference applicationDir; private EditTextPreference applicationDir;
@ -374,6 +375,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
plugins.setOnPreferenceClickListener(this); plugins.setOnPreferenceClickListener(this);
avoidRouting = (Preference) screen.findPreference("avoid_in_routing"); avoidRouting = (Preference) screen.findPreference("avoid_in_routing");
avoidRouting.setOnPreferenceClickListener(this); avoidRouting.setOnPreferenceClickListener(this);
preferRouting = (Preference) screen.findPreference("prefer_in_routing");
preferRouting.setOnPreferenceClickListener(this);
showAlarms = (Preference) screen.findPreference("show_routing_alarms"); showAlarms = (Preference) screen.findPreference("show_routing_alarms");
showAlarms.setOnPreferenceClickListener(this); showAlarms.setOnPreferenceClickListener(this);
@ -762,6 +766,10 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
}, new OsmandPreference[] { osmandSettings.AVOID_TOLL_ROADS, }, new OsmandPreference[] { osmandSettings.AVOID_TOLL_ROADS,
osmandSettings.AVOID_FERRIES, osmandSettings.AVOID_UNPAVED_ROADS, osmandSettings.AVOID_MOTORWAY }); osmandSettings.AVOID_FERRIES, osmandSettings.AVOID_UNPAVED_ROADS, osmandSettings.AVOID_MOTORWAY });
return true; return true;
} else if (preference == preferRouting) {
showBooleanSettings(new String[] { getString(R.string.prefer_motorways)},
new OsmandPreference[] { osmandSettings.PREFER_MOTORWAYS});
return true;
} else if (preference == showAlarms) { } else if (preference == showAlarms) {
showBooleanSettings(new String[] { getString(R.string.show_speed_limits), getString(R.string.show_cameras), showBooleanSettings(new String[] { getString(R.string.show_speed_limits), getString(R.string.show_cameras),
getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_SPEED_LIMITS, getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_SPEED_LIMITS,