karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Settings: separate recording settings (move GPS to sensors).

Browse Source
This commit is contained in:
Dennis Guse
2024-03-01 23:52:02 +01:00
parent fef1a3a84d
commit 887c24cbb0
37 changed files with 117 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/settings/GpsSettingsFragment.java → src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsFragment.java
+3 -27
View File
@@ -5,17 +5,15 @@ import android.os.Bundle;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceFragmentCompat;
import java.time.Duration;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.DistanceFormatter;
public class GpsSettingsFragment extends PreferenceFragmentCompat {
public class RecordingSettingsFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.settings_gps);
addPreferencesFromResource(R.xml.settings_recording);
UnitSystem unitSystem = PreferencesUtils.getUnitSystem();
@@ -39,46 +37,24 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
return getString(R.string.settings_recording_max_recording_distance_summary, formatter.formatDistance(distance));
}
);
findPreference(getString(R.string.recording_gps_accuracy_key))
.setSummaryProvider(
preference -> {
Distance distance = PreferencesUtils.getThresholdHorizontalAccuracy();
return getString(R.string.settings_recording_min_required_accuracy_summary, formatter.formatDistance(distance));
}
);
findPreference(getString(R.string.min_sampling_interval_key))
.setSummaryProvider(
preference -> {
Duration interval = PreferencesUtils.getMinSamplingInterval();
return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds()));
}
);
}
@Override
public void onStart() {
super.onStart();
((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_gps_title);
((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_recording_title);
}
@Override
public void onResume() {
super.onResume();
ListPreference minSamplingInterval = findPreference(getString(R.string.min_sampling_interval_key));
minSamplingInterval.setEntries(PreferencesUtils.getMinSamplingIntervalEntries());
ListPreference recordingDistanceInterval = findPreference(getString(R.string.recording_distance_interval_key));
recordingDistanceInterval.setEntries(PreferencesUtils.getRecordingDistanceIntervalEntries());
ListPreference maxRecordingDistance = findPreference(getString(R.string.max_recording_distance_key));
maxRecordingDistance.setEntries(PreferencesUtils.getMaxRecordingDistanceEntries());
ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries());
ListPreference idleDuration = findPreference(getString(R.string.idle_duration_key));
idleDuration.setEntries(PreferencesUtils.getIdleDurationEntries());
}
src/main/java/de/dennisguse/opentracks/settings/SensorsSettingsFragment.java
+40
View File
@@ -7,10 +7,15 @@ import android.widget.Toast;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.EditTextPreference;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import java.time.Duration;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.DistanceFormatter;
import de.dennisguse.opentracks.settings.bluetooth.BluetoothLeSensorPreference;
import de.dennisguse.opentracks.util.PermissionRequester;
@@ -22,6 +27,29 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.settings_sensors);
setWheelCircumferenceInputFilter();
UnitSystem unitSystem = PreferencesUtils.getUnitSystem();
final DistanceFormatter formatter = DistanceFormatter.Builder()
.setDecimalCount(0)
.setUnit(unitSystem)
.build(getContext());
findPreference(getString(R.string.recording_gps_accuracy_key))
.setSummaryProvider(
preference -> {
Distance distance = PreferencesUtils.getThresholdHorizontalAccuracy();
return getString(R.string.settings_recording_min_required_accuracy_summary, formatter.formatDistance(distance));
}
);
findPreference(getString(R.string.min_sampling_interval_key))
.setSummaryProvider(
preference -> {
Duration interval = PreferencesUtils.getMinSamplingInterval();
return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds()));
}
);
}
@Override
@@ -30,6 +58,18 @@ public class SensorsSettingsFragment extends PreferenceFragmentCompat {
((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_sensors_title);
}
@Override
public void onResume() {
super.onResume();
ListPreference minSamplingInterval = findPreference(getString(R.string.min_sampling_interval_key));
minSamplingInterval.setEntries(PreferencesUtils.getMinSamplingIntervalEntries());
ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries());
}
@Override
public void onDisplayPreferenceDialog(Preference preference) {
if (preference instanceof BluetoothLeSensorPreference) {
src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
} else if (key.equals(getString(R.string.settings_ui_key))) {
fragment = new UserInterfaceSettingsFragment();
} else if (key.equals(getString(R.string.settings_gps_key))) {
fragment = new GpsSettingsFragment();
fragment = new RecordingSettingsFragment();
} else if (key.equals(getString(R.string.settings_sensors_key))) {
fragment = new SensorsSettingsFragment();
} else if (key.equals(getString(R.string.settings_announcements_key))) {
src/main/res/values-b+es+419/strings.xml
+2 -2
View File
@@ -431,9 +431,9 @@
<string name="generic_yesterday">Ayer</string>
<string name="menu_filter">Filtrar</string>
<string name="settings_ui_summary">Apariencia, Diseño de grabación, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Intervalo de tiempo, Intervalo de distancia, Distancia máxima, Precisión</string>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_sensors_summary">Sensores de ciclismo, Circunferencia de la rueda, Sensores de carrera</string>
<string name="settings_export_section">Exportar</string>
<string name="activity_type_swimming">Natación</string>
src/main/res/values-cs/strings.xml
+2 -2
View File
@@ -482,13 +482,13 @@ limitations under the License.
<string name="settings_import_export_title">Import/Export</string>
<string name="settings_announcements_summary">Čas, vzdálenost, rychlost hlasu</string>
<string name="settings_announcements_statistics_title">Hlasová oznámení</string>
<string name="settings_sensors_title">Bluetooth senzory</string>
<string name="settings_sensors_title">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_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>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="generic_undo">Zrušit</string>
<string name="menu_select_layout">Vyberte rozvržení</string>
<string name="custom_layout_list_title">Rozložení</string>
src/main/res/values-da/strings.xml
+2 -2
View File
@@ -470,7 +470,7 @@ limitations under the License.
<string name="export_cannot_write_to_dir">Kan ikke skrive til eksportmappen.</string>
<string name="export_dir_not_writable">" (ikke skrivbar!)"</string>
<string name="menu_add_custom_layout">Nyt layout</string>
<string name="settings_sensors_title">Bluetooth-sensorer</string>
<string name="settings_sensors_title">Sensorer</string>
<string name="stats_custom_layout_default_layout">Standardlayout</string>
<string name="custom_layout_select_layout">Vælg layout</string>
<string name="settings_running_sensor">Kører</string>
@@ -482,7 +482,7 @@ limitations under the License.
<string name="generic_to">Til</string>
<string name="generic_from">Fra</string>
<string name="settings_ui_title">Brugergrænseflade</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_activity_defaults_category">Aktivitetens standardværdier</string>
<string name="settings_units_category">Enheder</string>
<string name="settings_layout_reset_done">Alle opsætningsindstillinger er blevet tilbageført til standardværdierne</string>
src/main/res/values-de/strings.xml
+2 -2
View File
@@ -489,9 +489,9 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka
<string name="description_speed_source_gps">GPS</string>
<string name="menu_select_layout">Wähle Layout</string>
<string name="generic_choose_an_option">Wähle eine Option</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_import_export_title">Import/Export</string>
<string name="settings_sensors_title">Bluetooth Sensoren</string>
<string name="settings_sensors_title">Sensoren</string>
<string name="settings_sensors_summary">Fahrradsensoren, Radumfang und Lauf-Sensoren</string>
<string name="settings_announcements_statistics_title">Sprachansagen</string>
<string name="generic_undo">Rückgängig</string>
src/main/res/values-es/strings.xml
+2 -2
View File
@@ -513,11 +513,11 @@ limitations under the License.
<string name="generic_yesterday">Ayer</string>
<string name="menu_add_custom_layout">Nuevo diseño</string>
<string name="settings_sensors_summary">Sensores de ciclismo, Circunferencia de la rueda, Sensores de carrera</string>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_gps_summary">Intervalo de tiempo, Intervalo de distancia, Distancia máxima, Precisión</string>
<string name="settings_ui_title">Interfaz de usuario</string>
<string name="settings_ui_summary">Apariencia, Diseño de grabación, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_announcements_statistics_title">Avisos de voz</string>
<string name="settings_units_category">Unidades</string>
<string name="settings_import_export_title">Importar/Exportar</string>
src/main/res/values-et/strings.xml
+2 -2
View File
@@ -460,13 +460,13 @@ limitations under the License.
<string name="settings_ui_title">Kasutajaliides</string>
<string name="settings_ui_summary">Välimus, Salvestamise Paigutus, Teema</string>
<string name="settings_gps_summary">Ajavahemik, vahemaa intervall, maksimaalne kaugus, täpsus</string>
<string name="settings_sensors_title">Bluetooth Andurid</string>
<string name="settings_sensors_title">Andurid</string>
<string name="settings_announcements_statistics_title">Häälteated</string>
<string name="settings_announcements_summary">Aeg, Kaugus, Hääle Kiirus</string>
<string name="settings_units_category">Ühikud</string>
<string name="settings_import_export_summary">Import, Eksport, Automaatne Eksport</string>
<string name="settings_import_export_title">Import/Eksport</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_open_tracks_summary">Kõik OpenTracks Projekti Kohta</string>
<string name="settings_reset_summary">Lähtestage Seaded vaikeväärtustele</string>
<string name="settings_recording_customize_layout_title">Kohandage oma salvestuspaigutust</string>
src/main/res/values-eu/strings.xml
+1 -2
View File
@@ -468,7 +468,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
<string name="stats_clock">Erlojua</string>
<string name="value_float_mile_hour">%1$.1f mi/h</string>
<string name="value_float_mile_hour_recommended">%1$.1f mi/h (gomendatua)</string>
<string name="settings_sensors_title">Bluetooth</string>
<string name="settings_gps_summary">Denbora-tartea, Distantzia-tartea, Gehienezko Distantzia, Zehaztasuna</string>
<string name="settings_announcements_statistics_title">Ahots Iragarkiak</string>
<string name="settings_announcements_summary">Denbora, Distantzia, Ahotsaren Abiadura</string>
@@ -492,7 +491,7 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
<string name="permission_bluetooth_failed_rejected">Sistema-ezarpenetan Gertuko Gailuetarako Opentestrak sarbidea eskuz eman behar duzu.</string>
<string name="settings_layout_reset_confirm_message">Diseinuaren ezarpen guztiak balio lehenetsietara itzuliko dira. Honek ez du gailuko pistarik ezabatuko.</string>
<string name="settings_sensor_bluetooth_service_filter_on">Eskatutako zerbitzuak iragartzen dituzten Bluetooth gailuak soilik erakutsi</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_open_tracks_summary">Guztiak Options Proiektuaren</string>
<string name="settings_defaults_title">Unitate eta Jarduera lehenetsiak</string>
<string name="settings_defaults_summary">Unitate Hobetsia, Jarduera Lehenetsia, Pistaren Izen Lehenetsia</string>
src/main/res/values-fi/strings.xml
+2 -2
View File
@@ -462,8 +462,8 @@ limitations under the License.
<string name="field_remove_from_layout">Poista</string>
<string name="menu_add_custom_layout">Uusi asettelu</string>
<string name="settings_ui_summary">Ulkonäkö, asettelu, teema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_sensors_title">Bluetooth-anturit</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_sensors_title">Anturit</string>
<string name="settings_import_export_title">Tuonti/Vienti</string>
<string name="custom_layout_list_edit_name">Nimeä luotava asettelu</string>
<string name="custom_layout_list_edit_already_exists">Samanniminen asettelu on jo olemassa</string>
src/main/res/values-fr/strings.xml
+2 -2
View File
@@ -520,9 +520,9 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
<string name="settings_import_export_title">Importez/Exportez</string>
<string name="settings_announcements_summary">Temps, distance, vitesse de la voix</string>
<string name="settings_announcements_statistics_title">Annonces vocales</string>
<string name="settings_sensors_title">Capteurs Bluetooth</string>
<string name="settings_sensors_title">Capteurs</string>
<string name="settings_gps_summary">Intervalle de temps, Intervalle de distance, Distance maximale, Précision</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_ui_title">Interface utilisateur</string>
<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>
src/main/res/values-ga/strings.xml
+2 -2
View File
@@ -205,7 +205,7 @@
<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>
<string name="settings_sensors_title">Braiteoirí Bluetooth</string>
<string name="settings_sensors_title">Braiteoirí</string>
<string name="settings_announcements_summary">Am, Fad, Luas Gutha</string>
<string name="settings_import_export_title">Iompórtáil/Easpórtáil</string>
<string name="settings_import_export_summary">Iompórtáil, Easpórtáil, Uathoibríoch</string>
@@ -385,7 +385,7 @@
<string name="description_sensor_cadence">Mál (rpm )</string>
<string name="description_speed_source_gps">GPS</string>
<string name="image_stop">Stad</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_api_title">API Poiblí</string>
<string name="settings_public_api_package_title">Ainm an phacáiste don API Poiblí</string>
<string name="settings_public_api_enabled_title">API Poiblí</string>
src/main/res/values-gl/strings.xml
+2 -2
View File
@@ -481,9 +481,9 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele
<string name="settings_defaults_title">Unidades e Actividade por defecto</string>
<string name="settings_ui_title">Interface da app</string>
<string name="settings_ui_summary">Aparencia, Gravación, Deseño, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Intervalo de tempo, Distancia intervalo, Max Distancia, Precisión</string>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_sensors_summary">Sensores de ciclismo, Circunferencia da roda, Sensores de carreira</string>
<string name="settings_announcements_statistics_title">Indicacións por Voz</string>
<string name="settings_import_export_title">Importación/Exportación</string>
src/main/res/values-hr/strings.xml
+2 -2
View File
@@ -320,7 +320,7 @@ limitations under the License.
<string name="permission_bluetooth_failed">OpenTracks zahtijeva dozvolu za korištenje Bluetootha.</string>
<string name="permission_bluetooth_failed_rejected">OpenTracksu moraš ručno dozvoliti pristup obližnjim uređajima u postavkama sustava.</string>
<string name="menu_add_custom_layout">Novi raspored</string>
<string name="settings_sensors_title">Bluetooth senzori</string>
<string name="settings_sensors_title">Senzori</string>
<string name="menu_filter">Filtar</string>
<string name="settings_recording_keep_screen_on_while_recording_summary">Tijekom snimanja ostavi ekran uključenim.</string>
<string name="settings_import_export_summary">Uvoz, Izvoz, Automatski izvoz</string>
@@ -330,7 +330,7 @@ limitations under the License.
<string name="sensor_state_cadence_max">Maks. ritam</string>
<string name="settings_units_category">Jedinice</string>
<string name="settings_open_tracks_summary">Sve o projektu OpenTracks</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_announcements_summary">Vrijeme, udaljenost, brzina glasa</string>
<string name="menu_resume_track">Nastavi rutu</string>
<string name="settings_ui_summary">Izgled, raspored snimanja, tema</string>
src/main/res/values-hu/strings.xml
+2 -2
View File
@@ -456,7 +456,7 @@ limitations under the License.
<string name="settings_ui_title">Felhasználói felület</string>
<string name="settings_ui_summary">Megjelenés, felvétel elrendezése, téma</string>
<string name="settings_gps_summary">Időintervallum, távolságintervallum, max. távolság, pontosság</string>
<string name="settings_sensors_title">Bluetooth érzékelők</string>
<string name="settings_sensors_title">érzékelők</string>
<string name="generic_dismiss">Elvetés</string>
<string name="settings_sensors_summary">Kerékpáros érzékelők, kerékkörfogat, futásérzékelők</string>
<string name="settings_announcements_statistics_title">Statisztikai közlemények</string>
@@ -568,7 +568,7 @@ limitations under the License.
<string name="custom_layout_select_layout">Elrendezés kiválasztása</string>
<string name="settings_announcements_distance_frequency">Kör hossza</string>
<string name="settings_announcements_lap_speed_pace">Körsebesség/tempó</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="voiceDistanceNauticalMilesPlural">{n,number,#.0} tengeri mérföld</string>
<string name="no_compatible_gallery_installed">Nincs kompatibilis képgaléria alkalmazás telepítve</string>
<string name="description_speed_source_gps">GPS</string>
src/main/res/values-in/strings.xml
+2 -2
View File
@@ -302,8 +302,8 @@
<string name="settings_import_export_summary">Impor, Ekspor, Ekspor Otomatis</string>
<string name="sensor_state_power_max">Tenaga Maks</string>
<string name="settings_ui_title">Antarmuka Pengguna</string>
<string name="settings_sensors_title">Sensor Bluetooth</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_sensors_title">Sensor</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_activity_defaults_category">Default Aktivitas</string>
<string name="settings_ui_summary">Penampilan, Tata letak perekaman, Tema</string>
<string name="settings_announcements_statistics_title">Pengumuman Statistik</string>
src/main/res/values-it/strings.xml
+2 -2
View File
@@ -478,9 +478,9 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
<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>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Intervallo di tempo, Intervallo di distanza, Massima Distanza, Precisione</string>
<string name="settings_sensors_title">Sensori Bluetooth</string>
<string name="settings_sensors_title">Sensori</string>
<string name="settings_announcements_statistics_title">Annunci Vocali</string>
<string name="settings_announcements_summary">Tempo, Distanza, Velocità della Voce</string>
<string name="settings_import_export_title">Importa/Esporta</string>
src/main/res/values-kn/strings.xml
+1 -1
View File
@@ -255,7 +255,7 @@
<string name="settings_defaults_summary">ಆದ್ಯತೆಯ ಘಟಕಗಳು, ಡೀಫಾಲ್ಟ್ ಚಟುವಟಿಕೆ, ಡೀಫಾಲ್ಟ್ ಟ್ರ್ಯಾಕ್ ಹೆಸರು</string>
<string name="settings_ui_title">ಬಳಕೆದಾರರ ಇಂಟರ್ಫೇಸ್</string>
<string name="settings_ui_summary">ಗೋಚರತೆ, ರೆಕಾರ್ಡಿಂಗ್ ಲೇಔಟ್, ಥೀಮ್</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">ಸಮಯದ ಮಧ್ಯಂತರ, ದೂರದ ಮಧ್ಯಂತರ, ಗರಿಷ್ಠ ದೂರ, ನಿಖರತೆ</string>
<string name="settings_sensors_title">ಬ್ಲೂಟೂತ್ ಸಂವೇದಕಗಳು</string>
<string name="settings_sensors_summary">ಸೈಕ್ಲಿಂಗ್ ಸಂವೇದಕಗಳು, ಚಕ್ರದ ಸುತ್ತಳತೆ, ಓಟದ ಸಂವೇದಕಗಳು</string>
src/main/res/values-nb/strings.xml
+2 -2
View File
@@ -474,9 +474,9 @@ limitations under the License.
<string name="settings_defaults_title">Forvalgsenheter og aktivitet</string>
<string name="settings_ui_title">Brukerflate</string>
<string name="settings_ui_summary">Utseende, opptakstilpasning, drakt</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Tidsintervall, distanseintervall, maks, distanse, nøyaktighet</string>
<string name="settings_sensors_title">Blåtannssensorer</string>
<string name="settings_sensors_title">Sensorer</string>
<string name="settings_announcements_statistics_title">Statistikkmeldinger</string>
<string name="settings_announcements_summary">Tid, distanse, talehastighet</string>
<string name="settings_import_export_title">Import/eksport</string>
src/main/res/values-nl/strings.xml
+2 -2
View File
@@ -490,7 +490,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
<string name="location_coordinate">%1$s°</string>
<string name="location_latitude_longitude">%1$s, %2$s</string>
<string name="value_float_kilometer_hour_recommended">%1$.1f km/u (aanbevolen)</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="export_cannot_write_to_dir">Geen schrijfrecht in export map.</string>
<string name="generic_choose_an_option">Maak een keuze</string>
<string name="permission_bluetooth_failed">OpenTracks heeft toestemming nodig om Bluetooth te gebruiken.</string>
@@ -522,7 +522,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
<string name="settings_defaults_title">Standaard Eenheden en Activiteit</string>
<string name="settings_defaults_summary">Voorkeurslengtemaat, standaardactiviteit, standaardroutenaam</string>
<string name="settings_gps_summary">Tijdsinterval, afstandsinterval, maximale afstand, nauwkeurigheid</string>
<string name="settings_sensors_title">Bluetooth sensoren</string>
<string name="settings_sensors_title">Sensoren</string>
<string name="settings_sensors_summary">Fiets sensoren, wielomtrek, loop sensoren</string>
<string name="settings_announcements_statistics_title">Gesproken berichten</string>
<string name="custom_layout_list_title">Lay-outs</string>
src/main/res/values-pl/strings.xml
+2 -2
View File
@@ -464,8 +464,8 @@ limitations under the License.
<string name="permission_bluetooth_failed_rejected">Należy manualnie zezwolić OpenTracks na dostęp do Najbliższych Urządzeń w ustawieniach.</string>
<string name="value_float_kilometer_hour">%1$.1f km/h</string>
<string name="settings_ui_summary">Wygląd, Układ ekranu śledzenia, Motyw</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_sensors_title">Czujnik Bluetooth</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_sensors_title">Czujnik</string>
<string name="settings_sensors_summary">Czujniki rowerowe, Obwód koła, Czujniki biegowe</string>
<string name="settings_announcements_statistics_title">Wiadomości głosowe</string>
<string name="settings_announcements_summary">Czas, Dystans, Głos prędkości</string>
src/main/res/values-pt-rBR/strings.xml
+2 -2
View File
@@ -423,13 +423,13 @@
<string name="stats_clock">Relógio</string>
<string name="settings_announcements_statistics_title">Anúncios de voz</string>
<string name="settings_sensors_summary">Voice announcements</string>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_gps_summary">Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão</string>
<string name="settings_ui_summary">Aparência, Layout de gravação, Tema</string>
<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_gps_title">GPS</string>
<string name="settings_gps_sensor">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>
<string name="settings_units_category">Unidades</string>
src/main/res/values-pt-rPT/strings.xml
+2 -2
View File
@@ -417,9 +417,9 @@
<string name="settings_defaults_summary">Unidades Preferidas, Atividade Padrão, Nome Padrão da Pista</string>
<string name="settings_ui_title">Interface do utilizador</string>
<string name="settings_ui_summary">Aparência, Layout de gravação, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Intervalo de tempo, Intervalo de distância, Distância máxima, Precisão</string>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_sensors_summary">Voice announcements</string>
<string name="settings_announcements_statistics_title">Anúncios de voz</string>
<string name="settings_announcements_summary">Tempo, distância, velocidade da voz</string>
src/main/res/values-pt/strings.xml
+2 -2
View File
@@ -449,10 +449,10 @@ limitations under the License.
<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>
<string name="settings_sensors_title">Sensores Bluetooth</string>
<string name="settings_sensors_title">Sensores</string>
<string name="settings_sensors_summary">Voice announcements</string>
<string name="settings_ui_summary">Aparência, Layout de gravação, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_announcements_statistics_title">Anúncios de voz</string>
<string name="settings_announcements_summary">Tempo, distância, velocidade da voz</string>
<string name="settings_import_export_title">Importar/Exportar</string>
src/main/res/values-ru/strings.xml
+2 -2
View File
@@ -449,9 +449,9 @@ limitations under the License.
<string name="menu_filter">Фильтр</string>
<string name="permission_bluetooth_failed">OpenTracks требуется разрешение на использование Bluetooth.</string>
<string name="permission_bluetooth_failed_rejected">Вам нужно вручную разрешить OpenTracks доступ к информации об устройствах поблизости в настройках системы.</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Интервал времени, интервал расстояния, макс. расстояние, точность</string>
<string name="settings_sensors_title">Bluetooth-датчики</string>
<string name="settings_sensors_title">датчики</string>
<string name="settings_sensors_summary">Велосипедные датчики, окружность колеса, датчики для бега</string>
<string name="settings_announcements_statistics_title">Голосовые подсказки статистические</string>
<string name="settings_import_export_title">Импорт/экспорт</string>
src/main/res/values-sk/strings.xml
+2 -2
View File
@@ -477,8 +477,8 @@ limitations under the License.
<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_announcements_statistics_title">Hlasové oznámenia</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_sensors_title">Senzory Bluetooth</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_sensors_title">Senzory</string>
<string name="settings_sensors_summary">Cyklistické snímače, obvod kolies, snímače behu</string>
<string name="settings_open_tracks_summary">Viac o projekte OpenTracks</string>
<string name="settings_gps_summary">Interval času, interval vzdialenosti, Max. vzdialenosť, Presnosť</string>
src/main/res/values-sl/strings.xml
+1 -1
View File
@@ -404,7 +404,7 @@ limitations under the License.
<string name="settings_recording_keep_screen_on_while_recording_title">Ohranite zaslon vklopljen</string>
<string name="settings_gps_summary">Časovni interval, Interval razdalje, Največja razdalja, Točnost</string>
<string name="settings_sensors_summary">Kolesarski senzorji, Obod kolesa, Tekaški senzorji</string>
<string name="settings_sensors_title">Bluetooth senzorji</string>
<string name="settings_sensors_title">Senzorji</string>
<string name="settings_recording_show_on_lockscreen_while_recording_title">Prikaži statistiko na zaklenjenem zaslonu</string>
<string name="about_preference_title">O OpenTracks</string>
<string name="export_without_photos">brez fotografij</string>
src/main/res/values-tr/strings.xml
+2 -2
View File
@@ -358,7 +358,7 @@ limitations under the License.
<string name="sensor_state_cadence_avg">Ort. Kadans</string>
<string name="sensor_state_cadence_max">Maks. Kadans</string>
<string name="settings_ui_summary">Görünüm, Kayıt Düzeni, Tema</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_defaults_summary">Tercih Edilen Birimler, Varsayılan Etkinlik, Varsayılan Parça Adı</string>
<string name="settings_gps_summary">Zaman aralığı, Mesafe aralığı, Maks. Mesafe, Hassasiyet</string>
<string name="settings_announcements_statistics_title">Sesli Anonslar</string>
@@ -379,7 +379,7 @@ limitations under the License.
<string name="export_all_do_it_for_all">bütün çatışmalar için bunu uygula</string>
<string name="generic_undo">Geri al</string>
<string name="menu_insert_gallery_img">Galeri resmi ekle</string>
<string name="settings_sensors_title">Bluetooth Sensörleri</string>
<string name="settings_sensors_title">Sensörleri</string>
<string name="settings_sensors_summary">Bisiklet Sensörleri, Tekerlek Çevresi, Koşu Sensörleri</string>
<plurals name="generic_completed_with_errors">
<item quantity="one">Bir hatayla tamamlandı</item>
src/main/res/values-uk/strings.xml
+2 -2
View File
@@ -480,7 +480,7 @@ limitations under the License.
<string name="settings_defaults_title">Одиниці виміру і дії за замовчуванням</string>
<string name="settings_ui_title">Інтерфейс користувача</string>
<string name="settings_ui_summary">Зовнішній вигляд, Макет запису, Тема</string>
<string name="settings_sensors_title">Датчики Bluetooth</string>
<string name="settings_sensors_title">Датчики</string>
<string name="settings_announcements_statistics_title">Голосові оголошення</string>
<string name="settings_gps_summary">Інтервал часу, інтервал відстані, Максимальна відстань, точність</string>
<string name="settings_sensors_summary">Датчики Їзди На Велосипеді, Окружність Колеса, Датчики Ходу</string>
@@ -504,7 +504,7 @@ limitations under the License.
<string name="value_float_mile_hour">%1$.1f km/h</string>
<string name="description_speed_source_gps">GPS</string>
<string name="value_float_kilometer_hour">%1$.1f km/h</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="no_compatible_file_manager_installed">Не встановлено сумісний файловий менеджер</string>
<string name="help_data_google_play_services_content">Ні</string>
<string name="activity_type_workout">тренування</string>
src/main/res/values-vi/strings.xml
+2 -2
View File
@@ -477,8 +477,8 @@ limitations under the License.
<string name="settings_defaults_summary">Đơn vị ưu tiên, Hoạt động mặc định, Tên mặc định tuyến đường</string>
<string name="settings_ui_title">Giao diện người dùng</string>
<string name="settings_ui_summary">Vẻ ngoài, Bố cục ghi, Chủ đề</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_sensors_title">Cảm Biến Bluetooth</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_sensors_title">Cảm Biến</string>
<string name="settings_sensors_summary">Đi Xe Đạp Cảm Biến, Bánh Vòng, Chạy Bộ Cảm Biến</string>
<string name="settings_announcements_statistics_title">Thông báo thống kê</string>
<string name="settings_announcements_summary">Thời Gian, Khoảng Cách, Tốc Độ Giọng Nói</string>
src/main/res/values-zh-rTW/strings.xml
+1 -1
View File
@@ -306,7 +306,7 @@ limitations under the License.
<string name="settings_defaults_summary">首選單位、預設活動、蹤跡預設名稱</string>
<string name="settings_ui_title">使用者介面</string>
<string name="settings_ui_summary">外觀、紀錄布局、主題</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">時間間隔、距離間隔、最大距離、精度</string>
<string name="settings_sensors_title">藍芽感測器</string>
<string name="settings_sensors_summary">自行車感測器、輪周、跑步感測器</string>
src/main/res/values-zh/strings.xml
+1 -1
View File
@@ -480,7 +480,7 @@ limitations under the License.
<string name="settings_defaults_summary">偏好的单位，默认活动类型，路线默认名称</string>
<string name="settings_ui_title">用户界面</string>
<string name="settings_ui_summary">外观，记录中布局，主题</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_import_export_title">导入/导出</string>
<string name="settings_activity_defaults_category">活动默认</string>
<string name="settings_announcements_totaltime_frequency">时间间隔</string>
src/main/res/values/strings.xml
+2 -2
View File
@@ -347,10 +347,10 @@ limitations under the License.
<string name="settings_ui_title">User Interface</string>
<string name="settings_ui_summary">Appearance, Recording Layout, Theme</string>
<string name="settings_gps_title">GPS</string>
<string name="settings_gps_sensor">GPS</string>
<string name="settings_gps_summary">Time interval, Distance interval, Max Distance, Accuracy</string>
<string name="settings_sensors_title">Bluetooth Sensors</string>
<string name="settings_sensors_title">Sensors</string>
<string name="settings_sensors_summary">Cycling Sensors, Wheel Circumference, Running Sensors</string>
src/main/res/xml/settings.xml
+1 -1
View File
@@ -19,7 +19,7 @@
android:icon="@drawable/ic_baseline_satellite_alt_24"
android:key="@string/settings_gps_key"
android:summary="@string/settings_gps_summary"
android:title="@string/settings_gps_title" />
android:title="@string/settings_recording_title" />
<Preference
android:icon="@drawable/ic_baseline_sensors_24"
src/main/res/xml/settings_gps.xml → src/main/res/xml/settings_recording.xml
+1 -13
View File
@@ -2,13 +2,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/settings_gps_title">
<ListPreference
android:defaultValue="@string/min_sampling_interval_default"
android:entryValues="@array/min_sampling_interval_values"
android:key="@string/min_sampling_interval_key"
android:title="@string/settings_recording_min_sampling_interval_title" />
android:title="@string/settings_recording_title">
<ListPreference
android:defaultValue="@string/recording_distance_interval_default"
@@ -22,12 +16,6 @@
android:key="@string/max_recording_distance_key"
android:title="@string/settings_recording_max_recording_distance_title" />
<ListPreference
android:defaultValue="@string/recording_gps_accuracy_default"
android:entryValues="@array/recording_gps_accuracy_values"
android:key="@string/recording_gps_accuracy_key"
android:title="@string/settings_recording_min_required_accuracy_title" />
<ListPreference
android:defaultValue="@string/idle_duration_default"
android:entryValues="@array/idle_duration_values"
src/main/res/xml/settings_sensors.xml
+14
View File
@@ -4,6 +4,20 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/settings_sensors_title">
<PreferenceCategory android:title="@string/settings_gps_sensor">
<ListPreference
android:defaultValue="@string/min_sampling_interval_default"
android:entryValues="@array/min_sampling_interval_values"
android:key="@string/min_sampling_interval_key"
android:title="@string/settings_recording_min_sampling_interval_title" />
<ListPreference
android:defaultValue="@string/recording_gps_accuracy_default"
android:entryValues="@array/recording_gps_accuracy_values"
android:key="@string/recording_gps_accuracy_key"
android:title="@string/settings_recording_min_required_accuracy_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_generic_sensor">
<de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference
android:defaultValue="@string/sensor_type_value_none"