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

feat: prioritize Bluetooth sensor data over GPS

Browse Source 
- Restructured sensor logic to give absolute priority to Bluetooth sensors, largely ignoring GPS data for distance and speed calculations.
- Implemented downstream UI expansions, custom recording layouts, and new settings to reflect and control the new sensor-first flow.
- Added MediaNotificationListenerService and integrated media playback tracking within statistics.
- Modified VoiceAnnouncementUtils to harmonize announcements with the updated architecture.
- Added 'About This Fork' section to the README.

Note: These modifications were co-created with Antigravity AI.
This commit is contained in:
Karol Labus
2026-09-11 14:02:57 +02:00
parent 00be0b565c
commit 7c6141f98c
50 changed files with 4338 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/drawable/ic_baseline_pause_24.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,19h4V5H6v14zm8,-14v14h4V5h-4z"/>
</vector>
src/main/res/drawable/ic_baseline_play_arrow_24.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M8,5v14l11,-7z"/>
</vector>
src/main/res/drawable/ic_baseline_skip_next_24.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
</vector>
src/main/res/drawable/ic_baseline_skip_previous_24.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,6h2v12H6zm3.5,6l8.5,6V6z"/>
</vector>
src/main/res/layout/stats_media_item.xml
+89
View File
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
<TextView
android:id="@+id/stats_media_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/media_title_default"
android:textAppearance="@style/TextAppearance.OpenTracks.PrimaryValue"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/stats_media_artist"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/media_artist_default"
android:textAppearance="@style/TextAppearance.OpenTracks.SecondaryHeader"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/stats_media_title" />
<LinearLayout
android:id="@+id/stats_media_controls"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/stats_media_artist"
app:layout_constraintBottom_toBottomOf="parent">
<ImageButton
android:id="@+id/stats_media_prev"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/media_prev"
android:src="@drawable/ic_baseline_skip_previous_24"
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/stats_media_play_pause"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/media_play_pause"
android:src="@drawable/ic_baseline_play_arrow_24"
app:tint="?attr/colorOnSurface" />
<ImageButton
android:id="@+id/stats_media_next"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/media_next"
android:src="@drawable/ic_baseline_skip_next_24"
app:tint="?attr/colorOnSurface" />
</LinearLayout>
<Button
android:id="@+id/stats_media_permission_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/media_permission_request"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
src/main/res/values-pl/strings.xml
+19
View File
@@ -197,6 +197,7 @@ limitations under the License.
<string name="settings_recording_max_recording_distance_summary">Nowy segment jest tworzony, jeśli odległość między dwiema lokalizacjami jest większa niż %1$s</string>
<string name="settings_recording_max_recording_distance_title">Maksymalna odległość</string>
<string name="settings_recording_min_recording_distance_title">Rejestrowanie odcinka</string>
<string name="settings_recording_marker_idle_duration_title">Minimalny czas długiej przerwy</string>
<string name="settings_recording_min_recording_interval_title">Rejestrowanie interwału</string>
<string name="settings_recording_min_required_accuracy_title">Dokładność GPS-u</string>
<string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
@@ -281,6 +282,7 @@ limitations under the License.
<string name="value_integer_meter_recommended">%1$d m (zalecane)</string>
<string name="value_integer_mile_hour">%1$d mil/h</string>
<string name="value_integer_minute">%1$d min</string>
<string name="value_integer_minute_recommended">%1$d min (zalecane)</string>
<string name="value_integer_second">%1$d s</string>
<string name="value_none">Brak</string>
<string name="value_off">Wyłącz</string>
@@ -443,6 +445,8 @@ limitations under the License.
<string name="settings_announcements_totaltime_frequency">Przedział czasu</string>
<string name="stats_sensors_heart_rate">Tętno</string>
<string name="stats_clock">Zegar</string>
<string name="stats_auto_pause_status">Status auto-pauzy</string>
<string name="stats_sensor_status">Status czujników</string>
<string name="settings_announcements_distance_frequency">Długość okrążenia</string>
<string name="settings_layout_reset_confirm_title">Zresetować twoje układy\?</string>
<string name="settings_cycling_sensor">Kolarstwo</string>
@@ -523,6 +527,10 @@ limitations under the License.
<string name="settings_announcements_lap_speed_pace">Tempo/prędkość okrążenia</string>
<string name="track_delete_number_of_tracks">%1$d ścieżki</string>
<string name="settings_announcements_idle_title">Przerwa</string>
<string name="settings_announcements_long_break_title">Długa przerwa (filiżanka)</string>
<string name="settings_announcements_sensor_category_title">Czujniki</string>
<string name="settings_announcements_sensor_disconnected_title">Odłączono czujnik</string>
<string name="settings_announcements_sensor_connected_title">Podłączono czujnik</string>
<string name="settings_recording_title">Nagrywanie</string>
<string name="settings_theme_switch_restart">Zmiana motywu może wymagać ręcznego restartu.</string>
<string name="settings_ui_dynamic_colors_summary">Użyj ręcznie zdefiniowanych Dynamicznych Kolorów (tylko Android 12+; wymaga ręcznego restartu)</string>
@@ -585,4 +593,15 @@ limitations under the License.
<string name="show_on_dashboard">API panelu OpenTracks</string>
<string name="marker_detail_title">%1$d z %2$d: %3$s</string>
<string name="voice_on_device_speaker_title">Użyj wbudowanego głośnika</string>
<string name="sensor_disconnected_warning">Czujnik rozłączony. Kontynuować z GPS?</string>
<string name="sensor_disconnected_switch_action">Przełącz</string>
<string name="settings_recording_auto_pause_on_cadence_0_title">Zatrzymaj przy prowadzeniu roweru</string>
<string name="settings_recording_auto_pause_on_cadence_0_summary">Uruchom autopauzę jeżeli kadencja wynosi 0 a prędkość wskazuje na chód</string>
<string name="settings_recording_auto_pause_on_cadence_0_speed_title">Maksymalna prędkość prowadzenia</string>
<string name="settings_recording_auto_pause_on_cadence_0_speed_summary">Prędkość poniżej której wykrywane jest prowadzenie roweru (gdy kadencja to 0)</string>
<string name="settings_recording_prevent_idle_if_cadence_title">Zapobiegaj pauzie podczas pedałowania</string>
<string name="settings_recording_prevent_idle_if_cadence_summary">Nie włączaj trybu postoju jeżeli pedałujesz, nawet przy braku ruchu</string>
<string name="voiceLongBreak">Rozpoczęto długą przerwę.</string>
<string name="voiceSensorDisconnected">Odłączono czujnik.</string>
<string name="voiceSensorConnected">Podłączono czujnik.</string>
</resources>
src/main/res/values/settings.xml
+35
View File
@@ -128,6 +128,14 @@
<string name="idle_duration_key" translatable="false">idleSpeedDuration</string>
<string name="idle_duration_default" translatable="false">10</string>
<string name="idle_duration_off" translatable="false">0</string>
<string-array name="auto_pause_cadence_0_speed_values">
<item>4</item>
<item>6</item>
<item>8</item>
<item>10</item>
<item>12</item>
</string-array>
<string-array name="idle_duration_values">
<item>@string/idle_duration_off</item>
<item>5</item>
@@ -139,6 +147,17 @@
<item>120</item>
</string-array>
<string name="marker_idle_duration_default" translatable="false">3</string>
<string-array name="marker_idle_duration_values">
<item>1</item>
<item>2</item>
<item>@string/marker_idle_duration_default</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>30</item>
</string-array>
<string name="stats_rate_key" translatable="false">statsRate</string>
<string name="stats_rate_default" translatable="false">@string/stats_rate_speed_or_pace_default</string>
<string-array name="stats_rate_metric_options">
@@ -243,6 +262,12 @@
<bool name="voice_on_device_speaker_default" translatable="false">true</bool>
<string name="voice_announce_idle_key" translatable="false">voice_announce_idle_key</string>
<bool name="voice_announce_idle_default" translatable="false">false</bool>
<string name="voice_announce_long_break_key" translatable="false">voice_announce_long_break_key</string>
<bool name="voice_announce_long_break_default" translatable="false">true</bool>
<string name="voice_announce_sensor_disconnected_key" translatable="false">voice_announce_sensor_disconnected_key</string>
<bool name="voice_announce_sensor_disconnected_default" translatable="false">true</bool>
<string name="voice_announce_sensor_connected_key" translatable="false">voice_announce_sensor_connected_key</string>
<bool name="voice_announce_sensor_connected_default" translatable="false">true</bool>
<string name="voice_announce_total_distance_key" translatable="false">voiceAnnounceTotalDistance</string>
<bool name="voice_announce_total_distance_default" translatable="false">true</bool>
@@ -379,6 +404,16 @@
<string name="stats_custom_layout_average_cadence_key" translatable="false">average_cadence</string>
<string name="stats_custom_layout_power_key" translatable="false">power</string>
<string name="stats_custom_layout_clock_key" translatable="false">time</string>
<string name="stats_custom_layout_auto_pause_status_key" translatable="false">auto_pause_status</string>
<string name="stats_custom_layout_sensor_status_key" translatable="false">sensor_status</string>
<string name="stats_custom_layout_sensor_status_hr_key" translatable="false">sensor_status_hr</string>
<string name="stats_custom_layout_sensor_status_cadence_key" translatable="false">sensor_status_cadence</string>
<string name="stats_custom_layout_sensor_status_speed_key" translatable="false">sensor_status_speed</string>
<string name="stats_custom_layout_debug_idle_timer_key" translatable="false">debug_idle_timer</string>
<string name="stats_custom_layout_debug_walking_timer_key" translatable="false">debug_walking_timer</string>
<string name="stats_custom_layout_debug_marker_timer_key" translatable="false">debug_marker_timer</string>
<string name="stats_custom_layout_media_key" translatable="false">media_control</string>
<!-- Stats empty values -->
<string name="stats_empty_value_integer" translatable="false">0</string>
src/main/res/values/strings.xml
+37 -1
View File
@@ -331,6 +331,10 @@ limitations under the License.
<string name="settings_sensors_summary">Cycling Sensors, Wheel Circumference, Running Sensors</string>
<string name="settings_announcements_idle_category_title">Idle Announcements</string>
<string name="settings_announcements_idle_title">Idle</string>
<string name="settings_announcements_long_break_title">Long break</string>
<string name="settings_announcements_sensor_category_title">Sensors</string>
<string name="settings_announcements_sensor_disconnected_title">Sensor disconnected</string>
<string name="settings_announcements_sensor_connected_title">Sensor connected</string>
<string name="settings_announcements_statistics_title">Statistics Announcements</string>
<string name="settings_announcements_summary">Time, Distance, Voice Speed</string>
<string name="settings_import_export_title">Import and Export</string>
@@ -369,7 +373,9 @@ limitations under the License.
<string name="settings_recording_max_recording_distance_summary">A new segment is created if the distance between two locations is greater than %1$s</string>
<string name="settings_recording_max_recording_distance_title">Max distance</string>
<string name="settings_recording_min_recording_distance_title">Recording distance interval</string>
<string name="settings_recording_min_recording_interval_title">Recording time interval</string>
<string name="marker_idle_duration_key" translatable="false">marker_idle_duration</string>
<string name="settings_recording_marker_idle_duration_title">Marker idle duration</string>
<string name="settings_recording_min_recording_interval_key" translatable="false">recording_min_recording_interval_key</string>
<string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is greater than %1$s</string>
<string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
<string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
@@ -478,6 +484,14 @@ limitations under the License.
<string name="stats_sensors_cadence">Cadence</string>
<string name="stats_sensors_power">Power</string>
<string name="stats_clock">Clock</string>
<string name="stats_auto_pause_status">Auto-Pause Status</string>
<string name="stats_sensor_status_hr">Sensor HR</string>
<string name="stats_sensor_status_cadence">Sensor Cadence</string>
<string name="stats_sensor_status_speed">Sensor Speed</string>
<string name="stats_debug_idle_timer">Idle Timer</string>
<string name="stats_debug_walking_timer">Walking Timer</string>
<string name="stats_debug_marker_timer">Marker Timer</string>
<!-- Track -->
<string name="track_name_format">Track %1$d</string>
<string name="track_recording_notification_accuracy">Location accuracy: %1$s</string>
@@ -536,6 +550,7 @@ limitations under the License.
<string name="value_float_mile_hour_recommended">%1$.1f mi/h (recommended)</string>
<string name="value_float_knots_recommended">%1$.1f knots (recommended)</string>
<string name="value_integer_minute">%1$d min</string>
<string name="value_integer_minute_recommended">%1$d min (recommended)</string>
<string name="value_integer_second">%1$d s</string>
<string name="value_none">None</string>
<string name="value_off">Off</string>
@@ -543,6 +558,9 @@ limitations under the License.
<string name="value_smallest_recommended">Smallest (recommended)</string>
<string name="value_int_seconds">%1$d s (recommended)</string>
<string name="voiceIdle">Becoming idle.</string>
<string name="voiceLongBreak">Long break recorded.</string>
<string name="voiceSensorDisconnected">Sensor disconnected.</string>
<string name="voiceSensorConnected">Sensor connected.</string>
<string name="voiceHoursPlural">
{n, plural,
=1 {1 hour}
@@ -705,4 +723,22 @@ limitations under the License.
<string name="settings_announcements_lap_power">Lap power</string>
<string name="power_x_watt">Power {x, plural, =1 {1 watt} other {# watts} }</string>
<string name="power">Power</string>
<string name="settings_recording_prevent_idle_if_cadence_key" translatable="false">preventIdleIfCadence</string>
<string name="settings_recording_prevent_idle_if_cadence_title">Prevent auto-pause if pedaling</string>
<string name="settings_recording_prevent_idle_if_cadence_summary">Do not enter idle mode while pedaling even if not moving</string>
<string name="sensor_disconnected_warning">Sensor disconnected. Continue with GPS?</string>
<string name="sensor_disconnected_switch_action">Switch</string>
<string name="settings_recording_auto_pause_on_cadence_0_key" translatable="false">autoPauseCadence0</string>
<string name="settings_recording_auto_pause_on_cadence_0_title">Auto-pause when carrying bike</string>
<string name="settings_recording_auto_pause_on_cadence_0_summary">Pause recording if cadence is 0 and speed is low</string>
<string name="settings_recording_auto_pause_on_cadence_0_speed_key" translatable="false">autoPauseCadence0Speed</string>
<string name="settings_recording_auto_pause_on_cadence_0_speed_title">Auto-pause max speed</string>
<string name="settings_recording_auto_pause_on_cadence_0_speed_summary">Speed below which walking with bike is detected (if cadence is 0)</string>
<string name="auto_pause_cadence_0_speed_default" translatable="false">8</string> <string name="media_title_default">No media playing</string>
<string name="media_artist_default">OpenTracks</string>
<string name="media_prev">Previous</string>
<string name="media_next">Next</string>
<string name="media_play_pause">Play/Pause</string>
<string name="media_permission_request">Enable Notification Access</string>
</resources>
src/main/res/xml/settings_announcements.xml
+15
View File
@@ -22,6 +22,21 @@
android:defaultValue="@bool/voice_announce_idle_default"
android:key="@string/voice_announce_idle_key"
android:title="@string/settings_announcements_idle_title" />
<SwitchPreferenceCompat
android:defaultValue="@bool/voice_announce_long_break_default"
android:key="@string/voice_announce_long_break_key"
android:title="@string/settings_announcements_long_break_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_announcements_sensor_category_title">
<SwitchPreferenceCompat
android:defaultValue="@bool/voice_announce_sensor_disconnected_default"
android:key="@string/voice_announce_sensor_disconnected_key"
android:title="@string/settings_announcements_sensor_disconnected_title" />
<SwitchPreferenceCompat
android:defaultValue="@bool/voice_announce_sensor_connected_default"
android:key="@string/voice_announce_sensor_connected_key"
android:title="@string/settings_announcements_sensor_connected_title" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_announcements_statistics_title">
src/main/res/xml/settings_recording.xml
+28
View File
@@ -4,6 +4,25 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/settings_recording_title">
<SwitchPreferenceCompat
android:defaultValue="false"
android:key="@string/settings_recording_auto_pause_on_cadence_0_key"
android:title="@string/settings_recording_auto_pause_on_cadence_0_title"
android:summary="@string/settings_recording_auto_pause_on_cadence_0_summary" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/settings_recording_prevent_idle_if_cadence_key"
android:title="@string/settings_recording_prevent_idle_if_cadence_title"
android:summary="@string/settings_recording_prevent_idle_if_cadence_summary" />
<ListPreference
android:defaultValue="@string/auto_pause_cadence_0_speed_default"
android:entryValues="@array/auto_pause_cadence_0_speed_values"
android:key="@string/settings_recording_auto_pause_on_cadence_0_speed_key"
android:title="@string/settings_recording_auto_pause_on_cadence_0_speed_title"
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="@string/recording_distance_interval_default"
android:entryValues="@array/recording_distance_interval_values"
@@ -19,8 +38,17 @@
<ListPreference
android:defaultValue="@string/idle_duration_default"
android:entryValues="@array/idle_duration_values"
android:entries="@array/idle_duration_values"
android:key="@string/idle_duration_key"
android:title="@string/settings_recording_idle_timeout_title"
app:useSimpleSummaryProvider="true" />
<ListPreference
android:defaultValue="@string/marker_idle_duration_default"
android:entryValues="@array/marker_idle_duration_values"
android:entries="@array/marker_idle_duration_values"
android:key="@string/marker_idle_duration_key"
android:title="@string/settings_recording_marker_idle_duration_title"
app:useSimpleSummaryProvider="true" />
</PreferenceScreen>