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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-08-24 13:34:22 +02:00
commit 17b5b3fc3e
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference android:title="@string/index_settings" android:key="local_indexes" android:summary="@string/index_settings_descr"></Preference>
<Preference android:title="@string/prefs_plugins" android:summary="@string/prefs_plugins_descr" android:key="plugins"
/>
<Preference android:key="general_settings" android:title="@string/general_settings_2" android:summary="@string/general_settings_descr"/>
<Preference android:key="routing_settings" android:title="@string/routing_settings_2" android:summary="@string/routing_settings_descr"/>
<Preference android:title="@string/shared_string_help" android:summary="@string/tips_and_tricks_descr" android:key="help"

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

@ -33,8 +33,6 @@ public class SettingsActivity extends SettingsBaseActivity {
private static final String CONTRIBUTION_VERSION_FLAG = "CONTRIBUTION_VERSION_FLAG";
private Preference plugins;
private Preference localIndexes;
private Preference general;
private Preference routing;
private Preference about;
@ -48,10 +46,6 @@ public class SettingsActivity extends SettingsBaseActivity {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.settings_pref);
PreferenceScreen screen = getPreferenceScreen();
localIndexes =(Preference) screen.findPreference("local_indexes");
localIndexes.setOnPreferenceClickListener(this);
plugins = (Preference) screen.findPreference("plugins");
plugins.setOnPreferenceClickListener(this);
general = (Preference) screen.findPreference("general_settings");
general.setOnPreferenceClickListener(this);
routing = (Preference) screen.findPreference("routing_settings");
@ -98,10 +92,7 @@ public class SettingsActivity extends SettingsBaseActivity {
@Override
public boolean onPreferenceClick(Preference preference) {
if (preference == localIndexes) {
startActivity(new Intent(this, getMyApplication().getAppCustomization().getDownloadIndexActivity()));
return true;
} else if (preference == general) {
if (preference == general) {
startActivity(new Intent(this, SettingsGeneralActivity.class));
return true;
} else if (preference == help) {
@ -113,9 +104,6 @@ public class SettingsActivity extends SettingsBaseActivity {
} else if (preference == about) {
showAboutDialog(getMyApplication());
return true;
} else if (preference == plugins) {
startActivityForResult(new Intent(this, getMyApplication().getAppCustomization().getPluginsActivity()), PLUGINS_SELECTION_REQUEST);
return true;
} else if (preference == version){
final Intent mapIntent = new Intent(this, ContributionVersionActivity.class);
this.startActivityForResult(mapIntent, 0);