Reorganize settings into multiple pages. The main page has icons, titles and summaries. Fixes #960.

2026-10-05 19:13:07 +02:00 · 2021-10-13 21:45:58 +02:00
parent 1bb8cbb82a
commit 66dac4b0ca
28 changed files with 1031 additions and 511 deletions
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.44,0.59l-3.18,3.18c-0.78,0.78 -0.78,2.05 0,2.83l1.24,1.24l-0.71,0.71L11.55,7.3c-0.78,-0.78 -2.05,-0.78 -2.83,0L7.3,8.72c-0.78,0.78 -0.78,2.05 0,2.83l1.24,1.24l-0.71,0.71L6.6,12.25c-0.78,-0.78 -2.05,-0.78 -2.83,0l-3.18,3.18c-0.78,0.78 -0.78,2.05 0,2.83l3.54,3.54c0.78,0.78 2.05,0.78 2.83,0l3.18,-3.18c0.78,-0.78 0.78,-2.05 0,-2.83l-1.24,-1.24l0.71,-0.71l1.24,1.24c0.78,0.78 2.05,0.78 2.83,0l1.41,-1.41c0.78,-0.78 0.78,-2.05 0,-2.83L13.84,9.6l0.71,-0.71l1.24,1.24c0.78,0.78 2.05,0.78 2.83,0l3.18,-3.18c0.78,-0.78 0.78,-2.05 0,-2.83l-3.54,-3.54C17.48,-0.2 16.22,-0.2 15.44,0.59zM6.6,19.32l-1.06,1.06L2,16.85l1.06,-1.06L6.6,19.32zM8.72,17.2l-1.06,1.06l-3.54,-3.54l1.06,-1.06L8.72,17.2zM18.26,7.66L17.2,8.72l-3.54,-3.54l1.06,-1.06L18.26,7.66zM20.38,5.54L19.32,6.6l-3.54,-3.54L16.85,2L20.38,5.54zM14,21l0,2c4.97,0 9,-4.03 9,-9l-2,0C21,17.87 17.87,21 14,21zM14,17l0,2c2.76,0 5,-2.24 5,-5l-2,0C17,15.66 15.66,17 14,17z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.76,16.24C6.67,15.16 6,13.66 6,12s0.67,-3.16 1.76,-4.24l1.42,1.42C8.45,9.9 8,10.9 8,12c0,1.1 0.45,2.1 1.17,2.83L7.76,16.24zM16.24,16.24C17.33,15.16 18,13.66 18,12s-0.67,-3.16 -1.76,-4.24l-1.42,1.42C15.55,9.9 16,10.9 16,12c0,1.1 -0.45,2.1 -1.17,2.83L16.24,16.24zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2s2,-0.9 2,-2S13.1,10 12,10zM20,12c0,2.21 -0.9,4.21 -2.35,5.65l1.42,1.42C20.88,17.26 22,14.76 22,12s-1.12,-5.26 -2.93,-7.07l-1.42,1.42C19.1,7.79 20,9.79 20,12zM6.35,6.35L4.93,4.93C3.12,6.74 2,9.24 2,12s1.12,5.26 2.93,7.07l1.42,-1.42C4.9,16.21 4,14.21 4,12S4.9,7.79 6.35,6.35z"/>
+</vector>
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,18H7V6h10V18zM8,10h8v1.5H8V10zM9,13h6v1.5H9V13z"/>
+</vector>
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+</vector>
@@ -10,7 +10,41 @@
    <string name="stats_fullscreen_while_recording_key" translatable="false">trackdetail_fullscreen_while_recording</string>
    <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_open_tracks_title" translatable="false">Open Tracks</string>
+    <string name="settings_open_tracks_summary">All About OpenTracks Project</string>
+
+    <string name="settings_defaults_key" translatable="false">settingsDefaults</string>
+    <string name="settings_defaults_title">Default Units and Activity</string>
+    <string name="settings_defaults_summary">Preferred Units, Default Activity, Track Default Name</string>
+
+    <string name="settings_ui_key" translatable="false">settingsUI</string>
+    <string name="settings_ui_title">User Interface</string>
+    <string name="settings_ui_summary">Appearance, Recording Layout, Theme</string>
+
+    <string name="settings_gps_key" translatable="false">settingsGps</string>
+    <string name="settings_gps_title">GPS</string>
+    <string name="settings_gps_summary">Time interval, Distance interval, Max Distance, Accuracy</string>
+
+    <string name="settings_sensors_key" translatable="false">settingsSensorsGps</string>
+    <string name="settings_sensors_title">Bluetooth Sensors</string>
+    <string name="settings_sensors_summary">Cycling Sensors, Wheel Circumference, Running Sensors</string>
+
+    <string name="settings_announcements_key" translatable="false">settingsAnnouncements</string>
+    <string name="settings_announcements_title">Voice Announcements</string>
+    <string name="settings_announcements_summary">Time, Distance, Voice Speed</string>
+
+    <string name="settings_import_export_key" translatable="false">settingsImportExport</string>
+    <string name="settings_import_export_title">Import/Export</string>
+    <string name="settings_import_export_summary">Import, Export, Auto Export</string>
+
+    <!-- Setting's categories -->
+    <string name="settings_units_category">Units</string>
+    <string name="settings_activity_defaults_category">Activity\'s Defaults</string>
+
    <string name="settings_reset_key" translatable="false">settingsReset</string>
+    <string name="settings_reset_summary">Reset Settings to Default Values</string>
    <string name="settings_layout_reset_key" translatable="false">settingsLayoutReset</string>

    <string name="settings_sensor_bluetooth_heart_rate_key" translatable="false">bluetoothSensor</string>
@@ -373,20 +373,24 @@ limitations under the License.
    <string name="settings_layout_reset_confirm_title">Reset your layouts?</string>
    <string name="settings_layout_reset_done">All layout settings have been reverted to the default values</string>
    <!-- Settings Reset -->
-    <string name="settings_all_reset">Reset All Settings</string>
+    <string name="settings_all_reset">Reset</string>
    <string name="settings_reset_confirm_message">All settings will be reverted to the default values. This will not delete any tracks on the device.</string>
    <string name="settings_reset_confirm_title">Reset now?</string>
    <string name="settings_reset_done">All settings have been reverted to the default values</string>
    <string name="settings_error_initial_values_restored">Sorry, but an error occurred. All settings have been reverted to the default values.</string>
    <!-- Settings Sensor -->
+    <string name="settings_generic_sensor">Generic</string>
+    <string name="settings_cycling_sensor">Cycling</string>
+    <string name="settings_running_sensor">Running</string>
+
    <string name="settings_sensor_bluetooth">Bluetooth</string>
    <string name="settings_sensor_connecting">Connected to %1$s</string>
    <string name="settings_sensor_disconnected">Disconnected from %1$s</string>

-    <string name="settings_sensor_cycling_distance_speed">Cycling: distance and speed</string>
-    <string name="settings_sensor_cycling_cadence">Cycling: cadence</string>
-    <string name="settings_sensor_running_speed_and_cadence">Running: distance, speed, and cadence</string>
-    <string name="settings_sensor_wheel_circumference">Wheel circumference (mm)</string>
+    <string name="settings_sensor_cycling_distance_speed">Distance and Speed</string>
+    <string name="settings_sensor_cycling_cadence">Cadence</string>
+    <string name="settings_sensor_running_speed_and_cadence">Distance, Speed, and Cadence</string>
+    <string name="settings_sensor_wheel_circumference">Wheel Circumference (mm)</string>

    <!-- Settings Stats -->
    <string name="settings_stats_rate_title">Preferred rate</string>
@@ -394,6 +398,10 @@ limitations under the License.
    <string name="settings_stats_units_metric">Metric (km, m)</string>
    <string name="settings_stats_units_title">Preferred units</string>

+    <!-- Settings import/export -->
+    <string name="settings_import_section">Import</string>
+    <string name="settings_export_section">Export</string>
+
    <string name="settings_prevent_reimport_tracks_title">Prevent re-import of tracks</string>
    <!-- Share Track -->
    <string name="share_track_share_file_body">I think you might be interested in this track.\n\n%1$s</string>
@@ -1,226 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2010 Google Inc.
+<?xml version="1.0" encoding="utf-8"?>

-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:title="@string/menu_settings">

-    <PreferenceCategory android:title="@string/menu_help">
-        <Preference android:title="@string/menu_help">
-            <intent
-                android:targetClass="de.dennisguse.opentracks.HelpActivity"
-                android:targetPackage="@string/applicationId" />
-        </Preference>
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_defaults_key"
+        android:title="@string/settings_defaults_title"
+        android:summary="@string/settings_defaults_summary"
+        android:icon="@drawable/ic_units" />

-    <PreferenceCategory android:title="@string/track_detail_stats_tab">
-        <ListPreference
-            android:defaultValue="@string/stats_units_default"
-            android:entries="@array/stats_units_options"
-            android:entryValues="@array/stats_units_values"
-            android:key="@string/stats_units_key"
-            android:title="@string/settings_stats_units_title"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/stats_rate_default"
-            android:entries="@array/stats_rate_metric_options"
-            android:entryValues="@array/stats_rate_values"
-            android:key="@string/stats_rate_key"
-            android:title="@string/settings_stats_rate_title"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_ui_key"
+        android:title="@string/settings_ui_title"
+        android:summary="@string/settings_ui_summary"
+        android:icon="@drawable/ic_ui" />

-    <PreferenceCategory android:title="@string/settings_show">
-        <Preference
-            app:key="@string/stats_custom_layout_key"
-            app:title="@string/settings_recording_customize_layout_title" />
-        <ListPreference
-            android:defaultValue="@string/night_mode_default"
-            android:entries="@array/night_mode_options"
-            android:entryValues="@array/night_mode_values"
-            android:key="@string/night_mode_key"
-            android:title="@string/settings_night_mode_title"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_gps_key"
+        android:title="@string/settings_gps_title"
+        android:summary="@string/settings_gps_summary"
+        android:icon="@drawable/ic_baseline_satellite_alt_24" />

-    <PreferenceCategory
-        android:key="@string/settings_recording_key"
-        android:title="@string/settings_recording"
-        app:initialExpandedChildrenCount="4">
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
-            android:key="@string/stats_show_on_lockscreen_while_recording_key"
-            android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
-            android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/stats_keep_screen_on_while_recording_default"
-            android:key="@string/stats_keep_screen_on_while_recording_key"
-            android:summary="@string/settings_recording_keep_screen_on_while_recording_summary"
-            android:title="@string/settings_recording_keep_screen_on_while_recording_title" />
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/stats_fullscreen_while_recording_default"
-            android:key="@string/stats_fullscreen_while_recording_key"
-            android:summary="@string/settings_recording_fullscreen_on_while_recording_summary"
-            android:title="@string/settings_recording_fullscreen_on_while_recording_title" />
-        <de.dennisguse.opentracks.settings.ActivityTypePreference
-            android:defaultValue="@string/default_activity_default"
-            android:key="@string/default_activity_key"
-            android:title="@string/settings_recording_default_activity_title" />
-        <ListPreference
-            android:defaultValue="@string/track_name_default"
-            android:entries="@array/track_name_options"
-            android:entryValues="@array/track_name_values"
-            android:key="@string/track_name_key"
-            android:title="@string/settings_recording_track_name_title"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/min_recording_interval_default"
-            android:entryValues="@array/min_recording_interval_values"
-            android:key="@string/min_recording_interval_key"
-            android:title="@string/settings_recording_min_recording_interval_title" />
-        <ListPreference
-            android:defaultValue="@string/recording_distance_interval_default"
-            android:entryValues="@array/recording_distance_interval_values"
-            android:key="@string/recording_distance_interval_key"
-            android:title="@string/settings_recording_min_recording_distance_title" />
-        <ListPreference
-            android:defaultValue="@string/max_recording_distance_default"
-            android:entryValues="@array/max_recording_distance_values"
-            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" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_sensors_key"
+        android:title="@string/settings_sensors_title"
+        android:summary="@string/settings_sensors_summary"
+        android:icon="@drawable/ic_baseline_sensors_24" />

-    <PreferenceCategory android:title="@string/settings_sensor_bluetooth">
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference
-            android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_heart_rate_key"
-            android:title="@string/sensor_state_heart_rate" />
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
-            android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_cycling_cadence_key"
-            android:title="@string/settings_sensor_cycling_cadence" />
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference
-            android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_cycling_power_key"
-            android:title="@string/sensor_state_power" />
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeRunningSpeedAndCadencePreference
-            android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_running_speed_and_cadence_key"
-            android:title="@string/settings_sensor_running_speed_and_cadence" />
-        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
-            android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_cycling_speed_key"
-            android:title="@string/settings_sensor_cycling_distance_speed" />
-        <EditTextPreference
-            android:defaultValue="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_default"
-            android:inputType="number"
-            android:key="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_key"
-            android:title="@string/settings_sensor_wheel_circumference"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_announcements_key"
+        android:title="@string/settings_announcements_title"
+        android:summary="@string/settings_announcements_summary"
+        android:icon="@drawable/ic_baseline_volume_up_24" />

-    <PreferenceCategory
-        android:title="@string/settings_announcements">
-        <ListPreference
-            android:defaultValue="@string/voice_announcement_frequency_default"
-            android:entryValues="@array/voice_announcement_frequency_values"
-            android:key="@string/voice_announcement_frequency_key"
-            android:title="@string/settings_announcements_totaltime_frequency"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/voice_announcement_distance_default"
-            android:entryValues="@array/voice_announcement_distance_values"
-            android:key="@string/voice_announcement_distance_key"
-            android:title="@string/settings_announcements_distance_frequency"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            android:defaultValue="@string/voice_speed_rate_default"
-            android:entryValues="@array/voice_speed_rate_values"
-            android:entries="@array/voice_speed_rate_values"
-            android:key="@string/voice_speed_rate_key"
-            android:title="@string/menu_voice_rate"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_import_export_key"
+        android:title="@string/settings_import_export_title"
+        android:summary="@string/settings_import_export_summary"
+        android:icon="@drawable/ic_baseline_import_export_24" />

-    <PreferenceCategory android:title="@string/generic_tracks">
-        <Preference
-            android:key="@string/settings_import"
-            android:title="@string/menu_import_all">
-            <intent
-                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$ImportDirectoryChooserActivity"
-                android:targetPackage="@string/applicationId" />
-        </Preference>
-        <Preference
-            android:key="@string/settings_export"
-            android:title="@string/menu_export_all">
-            <intent
-                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity"
-                android:targetPackage="@string/applicationId" />
-        </Preference>
-        <Preference
-            android:key="@string/settings_default_export_directory_key"
-            android:title="@string/settings_default_export_uri_title">
-            <intent
-                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity"
-                android:targetPackage="@string/applicationId" />
-        </Preference>
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/post_workout_export_enabled_default"
-            android:key="@string/post_workout_export_enabled_key"
-            android:summary="@string/instant_export_enabled_summary"
-            android:title="@string/instant_export_enabled_title" />
-        <ListPreference
-            android:defaultValue="@string/export_trackfileformat_default"
-            android:key="@string/export_trackfileformat_key"
-            android:title="@string/settings_default_trackfileformat"
-            app:useSimpleSummaryProvider="true" />
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/import_prevent_reimport_default"
-            android:key="@string/import_prevent_reimport_key"
-            android:title="@string/settings_prevent_reimport_tracks_title" />
-    </PreferenceCategory>
+    <de.dennisguse.opentracks.settings.ResetDialogPreference
+        android:dialogMessage="@string/settings_reset_confirm_message"
+        android:dialogTitle="@string/settings_reset_confirm_title"
+        android:key="@string/settings_reset_key"
+        android:negativeButtonText="@android:string/cancel"
+        android:persistent="false"
+        android:positiveButtonText="@android:string/ok"
+        android:title="@string/settings_all_reset"
+        android:summary="@string/settings_reset_summary"
+        android:icon="@drawable/ic_baseline_autorenew_24"/>

-    <PreferenceCategory android:title="@string/settings_reset">
-        <de.dennisguse.opentracks.settings.ResetDialogPreference
-            android:dialogMessage="@string/settings_layout_reset_confirm_message"
-            android:dialogTitle="@string/settings_layout_reset_confirm_title"
-            android:key="@string/settings_layout_reset_key"
-            android:negativeButtonText="@android:string/cancel"
-            android:persistent="false"
-            android:positiveButtonText="@android:string/ok"
-            android:title="@string/settings_layout_reset" />
-        <de.dennisguse.opentracks.settings.ResetDialogPreference
-            android:dialogMessage="@string/settings_reset_confirm_message"
-            android:dialogTitle="@string/settings_reset_confirm_title"
-            android:key="@string/settings_reset_key"
-            android:negativeButtonText="@android:string/cancel"
-            android:persistent="false"
-            android:positiveButtonText="@android:string/ok"
-            android:title="@string/settings_all_reset" />
-    </PreferenceCategory>
+    <Preference
+        android:key="@string/settings_open_tracks_key"
+        android:title="@string/settings_open_tracks_title"
+        android:summary="@string/settings_open_tracks_summary"
+        android:icon="@drawable/ic_baseline_info_24" />

-    <PreferenceCategory android:title="@string/about_preference_title">
-        <Preference android:title="@string/about_preference_title">
-            <intent
-                android:targetClass="de.dennisguse.opentracks.AboutActivity"
-                android:targetPackage="@string/applicationId" />
-        </Preference>
-    </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/settings_announcements_title">
+
+    <ListPreference
+        android:defaultValue="@string/voice_announcement_frequency_default"
+        android:entryValues="@array/voice_announcement_frequency_values"
+        android:key="@string/voice_announcement_frequency_key"
+        android:title="@string/settings_announcements_totaltime_frequency"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        android:defaultValue="@string/voice_announcement_distance_default"
+        android:entryValues="@array/voice_announcement_distance_values"
+        android:key="@string/voice_announcement_distance_key"
+        android:title="@string/settings_announcements_distance_frequency"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        android:defaultValue="@string/voice_speed_rate_default"
+        android:entryValues="@array/voice_speed_rate_values"
+        android:entries="@array/voice_speed_rate_values"
+        android:key="@string/voice_speed_rate_key"
+        android:title="@string/menu_voice_rate"
+        app:useSimpleSummaryProvider="true" />
+
+</PreferenceScreen>
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/settings_defaults_title">
+
+    <PreferenceCategory android:title="@string/settings_units_category">
+        <ListPreference
+            android:defaultValue="@string/stats_units_default"
+            android:entries="@array/stats_units_options"
+            android:entryValues="@array/stats_units_values"
+            android:key="@string/stats_units_key"
+            android:title="@string/settings_stats_units_title"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            android:defaultValue="@string/stats_rate_default"
+            android:entries="@array/stats_rate_metric_options"
+            android:entryValues="@array/stats_rate_values"
+            android:key="@string/stats_rate_key"
+            android:title="@string/settings_stats_rate_title"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_activity_defaults_category">
+        <de.dennisguse.opentracks.settings.ActivityTypePreference
+            android:defaultValue="@string/default_activity_default"
+            android:key="@string/default_activity_key"
+            android:title="@string/settings_recording_default_activity_title" />
+        <ListPreference
+            android:defaultValue="@string/track_name_default"
+            android:entries="@array/track_name_options"
+            android:entryValues="@array/track_name_values"
+            android:key="@string/track_name_key"
+            android:title="@string/settings_recording_track_name_title"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/settings_gps_title">
+
+    <ListPreference
+        android:defaultValue="@string/min_recording_interval_default"
+        android:entryValues="@array/min_recording_interval_values"
+        android:key="@string/min_recording_interval_key"
+        android:title="@string/settings_recording_min_recording_interval_title" />
+
+    <ListPreference
+        android:defaultValue="@string/recording_distance_interval_default"
+        android:entryValues="@array/recording_distance_interval_values"
+        android:key="@string/recording_distance_interval_key"
+        android:title="@string/settings_recording_min_recording_distance_title" />
+
+    <ListPreference
+        android:defaultValue="@string/max_recording_distance_default"
+        android:entryValues="@array/max_recording_distance_values"
+        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" />
+
+</PreferenceScreen>
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/settings_import_export_title">
+
+    <PreferenceCategory android:title="@string/settings_import_section">
+        <Preference
+            android:key="@string/settings_import"
+            android:title="@string/menu_import_all">
+            <intent
+                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$ImportDirectoryChooserActivity"
+                android:targetPackage="@string/applicationId" />
+        </Preference>
+        <SwitchPreferenceCompat
+            android:defaultValue="@bool/import_prevent_reimport_default"
+            android:key="@string/import_prevent_reimport_key"
+            android:title="@string/settings_prevent_reimport_tracks_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_export_section">
+        <Preference
+            android:key="@string/settings_export"
+            android:title="@string/menu_export_all">
+            <intent
+                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$ExportDirectoryChooserActivity"
+                android:targetPackage="@string/applicationId" />
+        </Preference>
+        <Preference
+            android:key="@string/settings_default_export_directory_key"
+            android:title="@string/settings_default_export_uri_title">
+            <intent
+                android:targetClass="de.dennisguse.opentracks.io.file.importer.DirectoryChooserActivity$DefaultTrackExportDirectoryChooserActivity"
+                android:targetPackage="@string/applicationId" />
+        </Preference>
+        <SwitchPreferenceCompat
+            android:defaultValue="@bool/post_workout_export_enabled_default"
+            android:key="@string/post_workout_export_enabled_key"
+            android:summary="@string/instant_export_enabled_summary"
+            android:title="@string/instant_export_enabled_title" />
+        <ListPreference
+            android:defaultValue="@string/export_trackfileformat_default"
+            android:key="@string/export_trackfileformat_key"
+            android:title="@string/settings_default_trackfileformat"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
@@ -0,0 +1,17 @@
+<?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>
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/settings_sensors_title">
+
+    <PreferenceCategory android:title="@string/settings_generic_sensor">
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeHeartRatePreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/settings_sensor_bluetooth_heart_rate_key"
+            android:title="@string/sensor_state_heart_rate" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_cycling_sensor">
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/settings_sensor_bluetooth_cycling_cadence_key"
+            android:title="@string/settings_sensor_cycling_cadence" />
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingPowerPreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/settings_sensor_bluetooth_cycling_power_key"
+            android:title="@string/sensor_state_power" />
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeCyclingCadenceAndSpeedPreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/settings_sensor_bluetooth_cycling_speed_key"
+            android:title="@string/settings_sensor_cycling_distance_speed" />
+        <EditTextPreference
+            android:defaultValue="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_default"
+            android:inputType="number"
+            android:key="@string/settings_sensor_bluetooth_cycling_speed_wheel_circumference_key"
+            android:title="@string/settings_sensor_wheel_circumference"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_running_sensor">
+        <de.dennisguse.opentracks.settings.bluetooth.BluetoothLeRunningSpeedAndCadencePreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/settings_sensor_bluetooth_running_speed_and_cadence_key"
+            android:title="@string/settings_sensor_running_speed_and_cadence" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/settings_ui_title">
+
+    <ListPreference
+        android:defaultValue="@string/night_mode_default"
+        android:entries="@array/night_mode_options"
+        android:entryValues="@array/night_mode_values"
+        android:key="@string/night_mode_key"
+        android:title="@string/settings_night_mode_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <Preference
+        app:key="@string/stats_custom_layout_key"
+        app:title="@string/settings_recording_customize_layout_title" />
+
+    <de.dennisguse.opentracks.settings.ResetDialogPreference
+        android:dialogMessage="@string/settings_layout_reset_confirm_message"
+        android:dialogTitle="@string/settings_layout_reset_confirm_title"
+        android:key="@string/settings_layout_reset_key"
+        android:negativeButtonText="@android:string/cancel"
+        android:persistent="false"
+        android:positiveButtonText="@android:string/ok"
+        android:title="@string/settings_layout_reset" />
+
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
+        android:key="@string/stats_show_on_lockscreen_while_recording_key"
+        android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
+        android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
+
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/stats_keep_screen_on_while_recording_default"
+        android:key="@string/stats_keep_screen_on_while_recording_key"
+        android:summary="@string/settings_recording_keep_screen_on_while_recording_summary"
+        android:title="@string/settings_recording_keep_screen_on_while_recording_title" />
+
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/stats_fullscreen_while_recording_default"
+        android:key="@string/stats_fullscreen_while_recording_key"
+        android:summary="@string/settings_recording_fullscreen_on_while_recording_summary"
+        android:title="@string/settings_recording_fullscreen_on_while_recording_title" />
+
+</PreferenceScreen>