Move Help from Settings to TrackList (overflow menu).

Fixes #956.

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);

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

src/main/java/de/dennisguse/opentracks/settings/OpenTracksSettingsFragment.java

@@ -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);
-    }
-}

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;

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" />
+    <item
+        android:id="@+id/track_list_help"
+        android:title="@string/menu_help" />
+
 </menu>

src/main/res/values-b+es+419/strings.xml

@@ -491,7 +491,6 @@
     <string name="settings_import_section">Importar</string>
     <string name="aggregated_stats_filter_no_results">No hay actividades para el filtro especificado</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (recomendado)</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recomendado)</string>
     <string name="generic_undo">Deshacer</string>

src/main/res/values-cs/strings.xml

@@ -520,7 +520,6 @@ limitations under the License.
     <string name="settings_sensors_title">Bluetooth senzory</string>
     <string name="settings_gps_summary">Časový interval, Interval vzdálenosti, Maximální vzdálenost, Přesnost</string>
     <string name="settings_ui_summary">Vzhled, Rozložení záznamu, Téma</string>
-    <string name="settings_open_tracks_title">O programu</string>
     <string name="settings_open_tracks_summary">Vše o projektu OpenTracks</string>
     <string name="settings_defaults_title">Výchozí jednotky a aktivity</string>
     <string name="settings_ui_title">Uživatelské rozhraní</string>

src/main/res/values-da/strings.xml

@@ -537,7 +537,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="settings_ui_summary">Udseende, Optagelse af layout, Tema</string>
     <string name="description_speed_source_gps">GPS</string>
     <string name="generic_filter">Filter</string>
-    <string name="settings_open_tracks_title">Åbne spor</string>
     <string name="custom_layout_list_edit_name">Skriv navnet på det layout, der skal tilføjes</string>
     <string name="settings_layout_reset_confirm_message">Alle layoutindstillinger vil blive tilbageført til standardværdierne. Dette vil ikke slette spor på enheden.</string>
     <string name="settings_all_reset">Nulstil</string>

src/main/res/values-de/strings.xml

@@ -574,6 +574,5 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
     <string name="settings_ui_summary">Erscheinungsbild, Aufzeichnungslayout, Theme</string>
     <string name="settings_gps_summary">Zeitintervall, Entfernungsintervall, Max Entfernung, Genauigkeit</string>
     <string name="description_speed_nautical">Geschwindigkeit (Knoten)</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="gps_recording_status">%1$s: %2$s</string>
 </resources>

src/main/res/values-es/strings.xml

@@ -542,7 +542,6 @@ limitations under the License.
     <string name="settings_open_tracks_summary">Todo sobre el proyecto OpenTracks</string>
     <string name="settings_defaults_title">Unidades y Actividad predeterminadas</string>
     <string name="settings_defaults_summary">Unidades preferidas, Actividad predeterminada, Nombre predeterminado del recorrido</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="generic_undo">Deshacer</string>
     <string name="no_compatible_file_manager_installed">No hay un gestor de archivos compatible instalado</string>
     <string name="settings_public_api_disabled_toast">La API pública de OpenTracks está deshabilitada: esta se puede activar en los ajustes.</string>

src/main/res/values-et/strings.xml

@@ -498,7 +498,6 @@ limitations under the License.
     <string name="settings_import_export_title">Import/Eksport</string>
     <string name="settings_gps_title">GPS</string>
     <string name="settings_open_tracks_summary">Kõik OpenTracks Projekti Kohta</string>
-    <string name="settings_open_tracks_title">OpenTracks</string>
     <string name="settings_reset_summary">Lähtestage Seaded vaikeväärtustele</string>
     <string name="settings_recording_customize_layout_title">Kohandage oma salvestuspaigutust</string>
     <string name="settings_recording_customize_layout_select_columns">Andmeväljad rea kohta</string>

src/main/res/values-eu/strings.xml

@@ -528,7 +528,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="settings_defaults_summary">Unitate Hobetsia, Jarduera Lehenetsia, Pistaren Izen Lehenetsia</string>
     <string name="settings_ui_title">Interfazea</string>
     <string name="settings_ui_summary">Itxura, Grabazioaren Diseinua, Gaia</string>
-    <string name="settings_open_tracks_title">Ireki Pistak</string>
     <string name="settings_cycling_sensor">Txirrindularitza</string>
     <string name="generic_filter">Iragazkia</string>
     <string name="generic_from">Nondik</string>

src/main/res/values-fr/strings.xml

@@ -526,7 +526,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="settings_defaults_summary">Unités préférées, Activité par défaut, Suivi du nom par défaut</string>
     <string name="settings_defaults_title">Unités et activité par défaut</string>
     <string name="settings_open_tracks_summary">A propos du projet OpenTracks</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="generic_undo">Annuler</string>
     <string name="menu_add_custom_layout">Nouvelle présentation</string>
     <string name="generic_filter">Filtre</string>

src/main/res/values-ga/strings.xml

@@ -208,7 +208,6 @@
     <string name="settings_ui_summary">Dealramh, Leagan Amach Taifeadta, Téama</string>
     <string name="settings_sensors_summary">Braiteoirí Rothaíochta, Imlíne Rothaí, Braiteoirí Reatha</string>
     <string name="bluetooth_disabled">Cumasaigh Bluetooth le do thoil.</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">Gach Maidir Tionscadal OpenTracks</string>
     <string name="settings_defaults_title">Aonaid agus Gníomhaíocht Réamhshocraithe</string>
     <string name="settings_ui_title">Comhéadan Úsáideora</string>

src/main/res/values-gl/strings.xml

@@ -505,7 +505,6 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele
     <string name="value_float_mile_hour_recommended">%1$.1f km/h (recomendado)</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recomendado)</string>
     <string name="stats_clock">Reloxo</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_defaults_summary">Unidades preferidas, Actividade por defecto, Nome da ruta</string>
     <string name="settings_announcements_summary">A Distancia, Tempo, Voz Velocidade</string>
     <string name="settings_open_tracks_summary">Todo Sobre OpenTracks Proxecto</string>

src/main/res/values-it/strings.xml

@@ -506,7 +506,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="settings_layout_reset_done">Tutte le impostazioni del layout sono state reimpostate ai valori predefiniti</string>
     <string name="settings_generic_sensor">Generico</string>
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
-    <string name="settings_open_tracks_title">Binari aperti</string>
     <string name="settings_open_tracks_summary">Tutto a proposito del progetto OpenTracks</string>
     <string name="settings_ui_title">Interfaccia Utente</string>
     <string name="settings_ui_summary">Aspetto, Layout durante la registrazione, Tema</string>

src/main/res/values-nb/strings.xml

@@ -498,7 +498,6 @@ limitations under the License.
     <string name="value_float_mile_hour">%1$.1f mi/h</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/h (anbefales)</string>
     <string name="stats_clock">Klokke</string>
-    <string name="settings_open_tracks_title">OpenTracks</string>
     <string name="settings_defaults_summary">Foretrukne enheter, forvalgsaktivitet, forvalgt spornavn</string>
     <string name="settings_sensors_summary">Sykkelsensorer, hjulomkrets, løpesensorer</string>
     <string name="settings_open_tracks_summary">Alt om OpenTracks-prosjektet</string>

src/main/res/values-nl/strings.xml

@@ -549,7 +549,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_recording_customize_layout_select_columns">Gegevensvelden per rij</string>
     <string name="value_float_mile_hour">%1$.1f mi/u</string>
     <string name="value_float_mile_hour_recommended">%1$.1f mi/u (aanbevolen)</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">Alles over het OpenTracks Project</string>
     <string name="activity_type_workout">training</string>
     <string name="settings_layout_reset_confirm_title">Lay-outs terugzetten\?</string>

src/main/res/values-pl/strings.xml

@@ -536,7 +536,6 @@ limitations under the License.
     <string name="field_remove_from_layout">Usuń</string>
     <string name="field_set_primary">Główny</string>
     <string name="field_set_secondary">Poboczny</string>
-    <string name="settings_open_tracks_title">Otwarte tory</string>
     <string name="settings_open_tracks_summary">Wszystko o projekcie OpenTacks</string>
     <string name="settings_defaults_title">Domyślne Jednostki i Aktywności</string>
     <string name="settings_defaults_summary">Preferowane Jednostki, Domyślne Aktywności, Nazwy Treningów</string>

src/main/res/values-pt-rBR/strings.xml

@@ -458,7 +458,6 @@
     <string name="settings_ui_title">Interface do usuário</string>
     <string name="settings_defaults_title">Unidades e Atividade Default</string>
     <string name="settings_defaults_summary">Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista</string>
-    <string name="settings_open_tracks_title">Trilhas abertas</string>
     <string name="settings_gps_title">GPS</string>
     <string name="settings_reset_summary">Redefinir configurações para valores padrão</string>
     <string name="settings_activity_defaults_category">Defaults da atividade</string>

src/main/res/values-pt-rPT/strings.xml

@@ -440,7 +440,6 @@
     <string name="sensor_state_power_avg">Energia Avg</string>
     <string name="sensor_could_not_scan">Não foi possível procurar aparelhos Bluetooth (erro %1$i).</string>
     <string name="bluetooth_disabled">Ative o Bluetooth.</string>
-    <string name="settings_open_tracks_title">Trilhas abertas</string>
     <string name="settings_open_tracks_summary">Tudo sobre o Projeto OpenTracks</string>
     <string name="settings_defaults_title">Unidades e Atividade Default</string>
     <string name="settings_defaults_summary">Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista</string>

src/main/res/values-pt/strings.xml

@@ -444,7 +444,6 @@ limitations under the License.
     <string name="sensor_state_power_avg">Energia Avg</string>
     <string name="sensor_could_not_scan">Não foi possível procurar aparelhos Bluetooth (erro %1$i).</string>
     <string name="bluetooth_disabled">Ative o Bluetooth.</string>
-    <string name="settings_open_tracks_title">Trilhas abertas</string>
     <string name="settings_open_tracks_summary">Tudo sobre o Projeto OpenTracks</string>
     <string name="settings_defaults_title">Unidades e Atividade Default</string>
     <string name="settings_gps_summary">Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão</string>

src/main/res/values-ru/strings.xml

@@ -505,7 +505,6 @@ limitations under the License.
     <string name="settings_public_api_enabled_summary_off">Только OpenTracks может запускать и останавливать запись.</string>
     <string name="value_float_mile_hour_recommended">%1$.1f миль/ч (рекомендуется)</string>
     <string name="export_cannot_write_to_dir">Невозможно записать в папку экспорта.</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">Всё о проекте OpenTracks</string>
     <string name="settings_defaults_summary">Предпочитаемые единицы, активность по умолчанию, название трека</string>
     <string name="settings_recording_customize_layout_title">Изменить раскладку записи</string>

src/main/res/values-sk/strings.xml

@@ -511,7 +511,6 @@ limitations under the License.
     <string name="settings_defaults_summary">Predvolené jednotky, predvolená aktivita, predvolený názov skladby</string>
     <string name="settings_ui_title">Používateľské rozhranie</string>
     <string name="settings_ui_summary">Vzhľad, Rozloženie nahrávania, Téma</string>
-    <string name="settings_open_tracks_title">Otvorené trate</string>
     <string name="settings_announcements_title">Hlasové oznámenia</string>
     <string name="settings_gps_title">GPS</string>
     <string name="settings_sensors_title">Senzory Bluetooth</string>

src/main/res/values-tr/strings.xml

@@ -427,7 +427,6 @@ limitations under the License.
     <string name="sensor_state_heart_rate_max">Maks. Kalp atış hızı</string>
     <string name="sensor_could_not_scan">Bluetooth cihazları taranamadı (%1$i hatası).</string>
     <string name="bluetooth_disabled">Lütfen Bluetooth\'u etkinleştirin.</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">OpenTracks Projesi hakkında her şey</string>
     <string name="help_support_title">OpenTracks\'i nasıl destekleyebilirim\?</string>
     <string name="export_track_already_exists_msg">%1$s parçası hedef dizinde zaten var.</string>

src/main/res/values-uk/strings.xml

@@ -516,7 +516,6 @@ limitations under the License.
     <string name="stats_sensors_cadence">Каденція</string>
     <string name="stats_sensors_heart_rate">частота серцебиття</string>
     <string name="settings_defaults_summary">Переважні одиниці виміру, активність за замовчуванням, Ім\'я треку за замовчуванням</string>
-    <string name="settings_open_tracks_title">Відкриті доріжки</string>
     <string name="settings_open_tracks_summary">Все про проект OpenTracks</string>
     <string name="settings_defaults_title">Одиниці виміру і дії за замовчуванням</string>
     <string name="settings_ui_title">Інтерфейс користувача</string>

src/main/res/values-vi/strings.xml

@@ -492,7 +492,6 @@ limitations under the License.
     <string name="value_float_kilometer_hour">%1$.1f km/h</string>
     <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (khuyến khích)</string>
     <string name="stats_clock">Cái đồng hồ</string>
-    <string name="settings_open_tracks_title">Mở Bài Hát</string>
     <string name="settings_reset_summary">Thiết lập lại các thiết Lập để mặc Định giá Trị</string>
     <string name="settings_activity_defaults_category">Hoạt động của Mặc định</string>
     <string name="settings_units_category">Đơn vị</string>

src/main/res/values-zh-rTW/strings.xml

@@ -323,7 +323,6 @@ limitations under the License.
     <string name="sensor_state_power_avg">平均功率</string>
     <string name="sensor_could_not_scan">無法掃描藍牙裝置 (錯誤 %1$i).</string>
     <string name="bluetooth_disabled">請啟用藍芽。</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">所有關於 OpenTracks 專案</string>
     <string name="settings_defaults_title">預設單位與活動</string>
     <string name="settings_defaults_summary">首選單位、預設活動、蹤跡預設名稱</string>

src/main/res/values-zh/strings.xml

@@ -579,7 +579,6 @@ limitations under the License.
     <string name="marker_add_photo_canceled">已取消，照片标记没有被添加</string>
     <string name="sensor_state_cadence_avg">平均步频</string>
     <string name="sensor_could_not_scan">无法扫描蓝牙设备（错误：%1$i）。</string>
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_units_category">单位</string>
     <string name="settings_recording_customize_layout_select_columns">每行数据字段数</string>
     <string name="settings_announcements_average_heart_rate">平均心率</string>

src/main/res/values/settings.xml

@@ -11,8 +11,6 @@
     <bool name="stats_fullscreen_while_recording_default" translatable="false">false</bool>
 
     <!-- Main settings -->
-    <string name="settings_open_tracks_key" translatable="false">settingsOpenTracks</string>
-
     <string name="settings_defaults_key" translatable="false">settingsDefaults</string>
 
     <string name="settings_ui_key" translatable="false">settingsUI</string>

src/main/res/values/strings.xml

@@ -336,7 +336,6 @@ limitations under the License.
     <string name="sensor_could_not_scan">Could not scan for Bluetooth devices (error %1$i).</string>
     <string name="bluetooth_disabled">Please enable Bluetooth.</string>
 
-    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">All About OpenTracks Project</string>
 
     <string name="settings_defaults_title">Default Units and Activity</string>

src/main/res/xml/settings.xml

@@ -54,12 +54,15 @@
         android:icon="@drawable/ic_baseline_api_24"
         android:key="@string/settings_api_key"
         android:summary="@string/settings_api_summary"
-        android:title="@string/settings_api_title"/>
+        android:title="@string/settings_api_title" />
 
     <Preference
         android:icon="@drawable/ic_baseline_info_24"
-        android:key="@string/settings_open_tracks_key"
         android:summary="@string/settings_open_tracks_summary"
-        android:title="@string/settings_open_tracks_title" />
+        android:title="@string/about_preference_title">
+        <intent
+            android:targetClass="de.dennisguse.opentracks.AboutActivity"
+            android:targetPackage="@string/applicationId" />
+    </Preference>
 
 </PreferenceScreen>

src/main/res/xml/settings_open_tracks.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_open_tracks_title">
-
-    <Preference android:title="@string/menu_help">
-        <intent
-            android:targetClass="de.dennisguse.opentracks.HelpActivity"
-            android:targetPackage="@string/applicationId" />
-    </Preference>
-    <Preference android:title="@string/about_preference_title">
-        <intent
-            android:targetClass="de.dennisguse.opentracks.AboutActivity"
-            android:targetPackage="@string/applicationId" />
-    </Preference>
-
-</PreferenceScreen>