diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 4fbc17ff6..a619f02b8 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -381,6 +381,12 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
SearchView searchView = (SearchView) searchMenuItem.getActionView();
searchView.setIconified(false);
searchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ return true;
+ }
+
+ if (item.getItemId() == R.id.track_list_help) {
+ startActivity(IntentUtils.newIntent(this, HelpActivity.class));
+ return true;
}
return super.onOptionsItemSelected(item);
diff --git a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
index 186f0a270..f2fd0bfbf 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
@@ -49,11 +49,6 @@ public class MainSettingsFragment extends PreferenceFragmentCompat {
((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_api_key));
return true;
});
-
- findPreference(getString(R.string.settings_open_tracks_key)).setOnPreferenceClickListener(preference -> {
- ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_open_tracks_key));
- return true;
- });
}
@Override
diff --git a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java
deleted file mode 100644
index 16b130453..000000000
--- a/src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dennisguse.opentracks.settings;
-
-import android.os.Bundle;
-
-import androidx.preference.PreferenceFragmentCompat;
-
-import de.dennisguse.opentracks.R;
-
-public class OpenTracksSettingsFragment extends PreferenceFragmentCompat {
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- addPreferencesFromResource(R.xml.settings_open_tracks);
- }
-
- @Override
- public void onStart() {
- super.onStart();
- ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_open_tracks_title);
- }
-}
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 6d6d76c48..ff480ea37 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -93,8 +93,6 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
fragment = new ImportExportSettingsFragment();
} else if (key.equals(getString(R.string.settings_api_key))) {
fragment = new PublicAPISettingsFragment();
- } else if (key.equals(getString(R.string.settings_open_tracks_key))) {
- fragment = new OpenTracksSettingsFragment();
}
return fragment;
diff --git a/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml
index 9dca7dfa1..d206e337c 100644
--- a/src/main/res/menu/track_list.xml
+++ b/src/main/res/menu/track_list.xml
@@ -42,4 +42,8 @@ limitations under the License.
android:id="@+id/track_list_settings"
android:icon="@drawable/ic_settings_24dp"
android:title="@string/menu_settings" />
+