Release: v3.22.0

With this change fields can be: short, wide, clock short or clock wide.
Fixes #1015.

.github/workflows/build_nightly.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
 
       - uses: actions/setup-java@v2
         with:
@@ -29,6 +29,6 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: OpenTracks-nightly.apk
-          path: ./build/outputs/apk/nightly/OpenTracks-nightly.apk
+          path: ./build/outputs/apk/nightly/*.apk
           retention-days: 7
 

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
 
       - uses: actions/setup-java@v2
         with:

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
         target: [ default ]
     steps:
       - name: checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
 
       - uses: actions/setup-java@v2
         with:

README.md

@@ -47,6 +47,15 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
         </td>
         <td></td>
     </tr>
+    <tr>
+        <td></td>
+        <td align="center">
+            <a href="https://www.amazon.de/dp/B09K2KNQ7X/">
+                <img alt="Get it on Amazon App Store" src="https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-appstore-badge-english-white.png" height="40" align="middle">
+            </a>
+        </td>
+        <td></td>
+    </tr>
 </table>
 
 ## Screenshots
@@ -132,4 +141,4 @@ Artwork, logos and user interface remained more or less unchanged.
 
 More information about _Google My Tracks_:
 * [Wikipedia page](https://en.wikipedia.org/wiki/MyTracks)
-* [Google code archive](https://code.google.com/archive/p/mytracks/)
+* [Google code archive](https://code.google.com/archive/p/mytracks/)

build.gradle

@@ -30,6 +30,12 @@ def getVersionName = { ->
     }
 }
 
+def versionCodeFromDate = { ->
+    def date = new Date()
+    def formattedDate = date.format('yyyyMMdd')
+    return Integer.valueOf(formattedDate)
+}
+
 android {
     compileOptions {
         coreLibraryDesugaringEnabled true
@@ -41,7 +47,7 @@ android {
     compileSdkVersion 31
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
     aaptOptions {
@@ -50,8 +56,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 4496
-        versionName "v3.21.0"
+        versionCode 4519
+        versionName "v3.22.0"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -82,7 +88,6 @@ android {
         nightly {
             signingConfig signingConfigs.nightly
             applicationIdSuffix ".nightly"
-            versionNameSuffix "-nightly"
         }
 
         release {
@@ -97,6 +102,14 @@ android {
 
     applicationVariants.all { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
+
+        if (variant.buildType.name == 'nightly') {
+            variant.outputs.all {
+                setVersionCodeOverride(versionCodeFromDate())
+                setVersionNameOverride(getVersionName())
+                outputFileName = "${applicationId}_${variant.versionCode}.apk"
+            }
+        }
     }
 }
 

fastlane/metadata/android/en-US/changelogs/4519.txt

@@ -0,0 +1,11 @@
+v3.22.0: OpenTracks
+
+Changes:
+- Locations are only stored if traveled distance > recording distance interval
+  (removed left over functionality from idle/non-idle detection)
+- UI can be configured to show a clock
+- Idle speed is now configurable
+
+Bugfix:
+- Intervals: crash when gain but not loss was stored
+- While recording: prevent crash when disabling voice announcements

fastlane/metadata/android/nb-NO/full_description.txt

@@ -1,4 +1,4 @@
-OpenTracks er en sportsporingsapp som respekterer ditt personvern.
+OpenTracks er en app for opptak av sportsaktivitet som respekterer ditt personvern.
 
 Funksjoner:
 * Sportsporing: Registrer dine sports- og utendørsaktiviteter

fastlane/metadata/android/nb-NO/short_description.txt

@@ -1 +1 @@
-En sportsregistrerer som respekterer ditt personvern.
+En opptaker av sportsaktivitet som respekterer ditt personvern.

src/androidTest/java/de/dennisguse/opentracks/TestRunner.java

@@ -3,7 +3,6 @@ package de.dennisguse.opentracks;
 import android.app.Application;
 import android.content.Context;
 
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.runner.AndroidJUnitRunner;
 
 public class TestRunner extends AndroidJUnitRunner {

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java

@@ -20,11 +20,14 @@ import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.internal.debugging.LocationImpl;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import de.dennisguse.opentracks.content.data.Altitude;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.content.data.TestDataUtil;
@@ -39,7 +42,6 @@ import de.dennisguse.opentracks.io.file.importer.TrackPointAssert;
 import de.dennisguse.opentracks.services.sensors.AltitudeSumManager;
 import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.util.PressureSensorUtils;
 
 /**
  * Tests insert location.
@@ -188,7 +190,7 @@ public class TrackRecordingServiceTestLocation {
         TrackRecordingServiceTest.newTrackPoint(service, 45.000002, 35.0, 3, 15);
         TrackRecordingServiceTest.newTrackPoint(service, 45.000003, 35.0, 4, 15);
         TrackRecordingServiceTest.newTrackPoint(service, 45.000004, 35.0, 5, 15);
-        TrackRecordingServiceTest.newTrackPoint(service, 45.000005, 35.0, 6, 15);
+        TrackRecordingServiceTest.newTrackPoint(service, 45.0002, 35.0, 6, 15);
 
         service.endCurrentTrack();
 
@@ -208,7 +210,7 @@ public class TrackRecordingServiceTestLocation {
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f),
                 new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.0005)
+                        .setLatitude(45.0002)
                         .setLongitude(35)
                         .setHorizontalAccuracy(Distance.of(6))
                         .setSpeed(Speed.of(15))
@@ -218,6 +220,9 @@ public class TrackRecordingServiceTestLocation {
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f)
         ), trackPoints);
+
+
+
     }
 
     @MediumTest
@@ -252,13 +257,6 @@ public class TrackRecordingServiceTestLocation {
                         .setSpeed(Speed.of(0))
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
                 new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f)
@@ -298,13 +296,6 @@ public class TrackRecordingServiceTestLocation {
                         .setSpeed(Speed.of(15))
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(6))
-                        .setSpeed(Speed.of(15))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
                 new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f)
@@ -471,20 +462,12 @@ public class TrackRecordingServiceTestLocation {
                         .setHorizontalAccuracy(Distance.of(2))
                         .setSpeed(Speed.of(5))
                         .setSensorDistance(Distance.of(10)),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(4))
-                        .setSpeed(Speed.of(5))
-                        .setAltitudeGain(6f)
-                        .setAltitudeLoss(6f)
-                        .setSensorDistance(Distance.of(2)),
                 new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                         .setSensorDistance(Distance.of(11))
                         .setSpeed(Speed.of(5))
-                        .setAltitudeGain(6f)
-                        .setAltitudeLoss(6f)
-                        .setSensorDistance(Distance.of(2))
+                        .setAltitudeGain(12f)
+                        .setAltitudeLoss(12f)
+                        .setSensorDistance(Distance.of(4))
         ), trackPoints);
     }
 
@@ -528,13 +511,6 @@ public class TrackRecordingServiceTestLocation {
                         .setSpeed(Speed.of(0))
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.1)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(3))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
 
                 new TrackPoint(TrackPoint.Type.SEGMENT_START_AUTOMATIC, null)
                         .setLatitude(45.2)
@@ -543,13 +519,6 @@ public class TrackRecordingServiceTestLocation {
                         .setSpeed(Speed.of(0))
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f),
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, null)
-                        .setLatitude(45.2)
-                        .setLongitude(35)
-                        .setHorizontalAccuracy(Distance.of(5))
-                        .setSpeed(Speed.of(0))
-                        .setAltitudeGain(0f)
-                        .setAltitudeLoss(0f),
                 new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, null)
                         .setAltitudeGain(0f)
                         .setAltitudeLoss(0f)

src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java

@@ -93,8 +93,8 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseRunningSpeedAndCadence_with_distance() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, 0, 0);
-        characteristic.setValue(new byte[]{2, 0, 5, 80, 12, 1});
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID, 0, 0);
+        characteristic.setValue(new byte[]{2, 0, 5, 80, (byte) 0xFF, (byte) 0xFF, 0, 1});
 
         // when
         SensorDataRunning sensor = BluetoothUtils.parseRunningSpeedAndCadence("address", "sensorName", characteristic);
@@ -102,6 +102,6 @@ public class BluetoothUtilsTest {
         // then
         assertEquals(Speed.of(5), sensor.getSpeed());
         assertEquals(80, sensor.getCadence(), 0.01);
-        assertEquals(Distance.of(26.8), sensor.getTotalDistance());
+        assertEquals(Distance.of(6553.5 + 1677721.6), sensor.getTotalDistance());
     }
 }

src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java

@@ -23,6 +23,7 @@ import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(JUnit4.class)
 public class IntervalStatisticsTest {
@@ -115,9 +116,40 @@ public class IntervalStatisticsTest {
         whenAndThen(10000, distanceInterval);
     }
 
+    @Test
+    public void testWithNoLossTrackPoints() {
+        // TrackPoints with elevation gain but without elevation loss.
+
+        // given
+        float distanceInterval = 1000f;
+        int numberOfPoints = 10000;
+        Track dummyTrack = new Track();
+        dummyTrack.setId(new Track.Id(System.currentTimeMillis()));
+        dummyTrack.setName("Dummy Track Without Elevation Loss");
+        contentProviderUtils.insertTrack(dummyTrack);
+        TrackStatisticsUpdater trackStatisticsUpdater = new TrackStatisticsUpdater();
+        for (int i = 0; i < numberOfPoints; i++) {
+            TrackPoint tp = TestDataUtil.createTrackPoint(i);
+            tp.setAltitudeLoss(null);
+            contentProviderUtils.insertTrackPoint(tp, dummyTrack.getId());
+            trackStatisticsUpdater.addTrackPoint(tp, Distance.of(0));
+        }
+        dummyTrack.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
+        contentProviderUtils.updateTrack(dummyTrack);
+        Pair<Track.Id, TrackStatistics> trackWithStats = new Pair<>(dummyTrack.getId(), trackStatisticsUpdater.getTrackStatistics());
+
+        // when and then
+        whenAndThen(trackWithStats, numberOfPoints, distanceInterval);
+    }
+
     private void whenAndThen(int numberOfPoints, float distanceInterval) {
-        IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval), Distance.of(0));
         Pair<Track.Id, TrackStatistics> trackWithStats = TestDataUtil.buildTrackWithTrackPoints(contentProviderUtils, numberOfPoints);
+        whenAndThen(trackWithStats, numberOfPoints, distanceInterval);
+
+    }
+
+    private void whenAndThen(Pair<Track.Id, TrackStatistics> trackWithStats, int numberOfPoints, float distanceInterval) {
+        IntervalStatistics intervalStatistics = new IntervalStatistics(Distance.of(distanceInterval), Distance.of(0));
         Track.Id trackId = trackWithStats.first;
         TrackStatistics trackStatistics = trackWithStats.second;
         try (TrackPointIterator trackPointIterator = contentProviderUtils.getTrackPointLocationIterator(trackId, null)) {
@@ -127,18 +159,39 @@ public class IntervalStatisticsTest {
         List<IntervalStatistics.Interval> intervalList = intervalStatistics.getIntervalList();
         Distance totalDistance = Distance.of(0);
         float totalTime = 0L;
-        float totalGain = 0f;
+        Float totalGain = null;
+        Float totalLoss = null;
         for (IntervalStatistics.Interval i : intervalList) {
             totalDistance = totalDistance.plus(i.getDistance());
             totalTime += i.getDistance().toM() / i.getSpeed().toMPS();
-            totalGain += i.getGain_m();
+
+            if (totalGain == null) {
+                totalGain = i.getGain_m();
+            } else if (i.getGain_m() != null) {
+                totalGain += i.getGain_m();
+            }
+
+            if (totalLoss == null) {
+                totalLoss = i.getLoss_m();
+            } else if (i.getLoss_m() != null) {
+                totalLoss += i.getLoss_m();
+            }
         }
 
         // then
         assertEquals(trackStatistics.getTotalDistance().toM(), totalDistance.toM(), 0.01);
         assertEquals(trackStatistics.getTotalTime().toMillis(), totalTime * UnitConversions.S_TO_MS, 1);
         assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance().toM() / distanceInterval));
-        assertEquals(totalGain, numberOfPoints * TestDataUtil.ALTITUDE_GAIN, 0.1);
+        if (totalGain != null) {
+            assertEquals(totalGain, numberOfPoints * TestDataUtil.ALTITUDE_GAIN, 0.1);
+        } else {
+            assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatistics.Interval::hasGain));
+        }
+        if (totalLoss != null) {
+            assertEquals(totalLoss, numberOfPoints * TestDataUtil.ALTITUDE_LOSS, 0.1);
+        } else {
+            assertTrue(intervalStatistics.getIntervalList().stream().noneMatch(IntervalStatistics.Interval::hasLoss));
+        }
 
         for (int i = 0; i < intervalList.size() - 1; i++) {
             assertEquals(intervalList.get(i).getDistance().toM(), distanceInterval, 0.001);

src/main/java/de/dennisguse/opentracks/adapters/SettingsCustomLayoutAdapter.java

@@ -61,13 +61,8 @@ public class SettingsCustomLayoutAdapter extends RecyclerView.Adapter<RecyclerVi
         }
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        return layout.getFields().get(position).isWide() ? CustomLayoutFieldType.WIDE.value() : CustomLayoutFieldType.SHORT.value();
-    }
-
     public boolean isItemWide(int position) {
-        return getItemViewType(position) == CustomLayoutFieldType.WIDE.value();
+        return layout.getFields().get(position).isWide();
     }
 
     public DataField getItem(int position) {

src/main/java/de/dennisguse/opentracks/adapters/StatisticsAdapter.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextClock;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -13,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.content.data.CustomLayoutFieldType;
 import de.dennisguse.opentracks.viewmodels.StatisticData;
 
 public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -28,15 +30,26 @@ public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_item, parent, false);
-        return new StatisticsAdapter.ViewHolder(view);
+        View view;
+        if (viewType == CustomLayoutFieldType.CLOCK.value()) {
+            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_clock_item, parent, false);
+            return new StatisticsAdapter.ViewClockHolder(view);
+        } else {
+            view = LayoutInflater.from(parent.getContext()).inflate(R.layout.stats_generic_item, parent, false);
+            return new StatisticsAdapter.ViewHolder(view);
+        }
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        StatisticsAdapter.ViewHolder viewHolder = (StatisticsAdapter.ViewHolder) holder;
         StatisticData statisticData = statisticDataList.get(position);
-        viewHolder.setData(statisticData);
+        if (getItemViewType(position) == CustomLayoutFieldType.CLOCK.value()) {
+            StatisticsAdapter.ViewClockHolder viewHolder = (StatisticsAdapter.ViewClockHolder) holder;
+            viewHolder.setData(statisticData);
+        } else {
+            StatisticsAdapter.ViewHolder viewHolder = (StatisticsAdapter.ViewHolder) holder;
+            viewHolder.setData(statisticData);
+        }
     }
 
     @Override
@@ -50,11 +63,15 @@ public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     @Override
     public int getItemViewType(int position) {
-        return statisticDataList.get(position).getField().isWide() ? CustomLayoutFieldType.WIDE.value() : CustomLayoutFieldType.SHORT.value();
+        if (statisticDataList.get(position).getField().getType(context) == CustomLayoutFieldType.CLOCK) {
+            return CustomLayoutFieldType.CLOCK.value();
+        } else {
+            return CustomLayoutFieldType.GENERIC.value();
+        }
     }
 
     public boolean isItemWide(int position) {
-        return getItemViewType(position) == CustomLayoutFieldType.WIDE.value();
+        return statisticDataList.get(position).getField().isWide();
     }
 
     public List<StatisticData> swapData(List<StatisticData> data) {
@@ -116,6 +133,25 @@ public class StatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
+    private class ViewClockHolder extends RecyclerView.ViewHolder {
+        final TextClock value;
+        final TextView descMain;
+
+        public ViewClockHolder(@NonNull View itemView) {
+            super(itemView);
+            value = itemView.findViewById(R.id.stats_clock);
+            descMain = itemView.findViewById(R.id.stats_description_main);
+        }
+
+        public void setData(StatisticData statisticData) {
+            if (statisticData == null) {
+                return;
+            }
+            this.value.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.StatsPrimaryValue : R.style.StatsSecondaryValue);
+            this.descMain.setTextAppearance(context, statisticData.getField().isPrimary() ? R.style.StatsPrimaryLabel : R.style.StatsSecondaryLabel);
+        }
+    }
+
     private class ViewRecordedHolder extends ViewHolder {
 
         public ViewRecordedHolder(@NonNull View itemView) {

src/main/java/de/dennisguse/opentracks/content/data/CustomLayoutFieldType.java

@@ -1,8 +1,8 @@
-package de.dennisguse.opentracks.adapters;
+package de.dennisguse.opentracks.content.data;
 
-enum CustomLayoutFieldType {
-    SHORT(0),
-    WIDE(1);
+public enum CustomLayoutFieldType {
+    GENERIC(1),
+    CLOCK(2);
 
     private final int value;
 

src/main/java/de/dennisguse/opentracks/content/data/DataField.java

@@ -52,6 +52,14 @@ public class DataField {
         return isWide;
     }
 
+    public CustomLayoutFieldType getType(Context context) {
+        if (key.equals(context.getString(R.string.stats_custom_layout_clock_key))) {
+            return CustomLayoutFieldType.CLOCK;
+        } else {
+            return CustomLayoutFieldType.GENERIC;
+        }
+    }
+
     public String toCsv() {
         String visible = this.isVisible ? YES_VALUE : NOT_VALUE;
         String primary = this.isPrimary ? YES_VALUE : NOT_VALUE;
@@ -95,6 +103,8 @@ public class DataField {
             return resources.getString(R.string.stats_sensors_cadence);
         } else if (key.equals(resources.getString(R.string.stats_custom_layout_power_key))) {
             return resources.getString(R.string.stats_sensors_power);
+        } else if (key.equals(resources.getString(R.string.stats_custom_layout_clock_key))) {
+            return resources.getString(R.string.stats_clock);
         } else {
             throw new RuntimeException("It doesn't exists a field with key: " + key);
         }

src/main/java/de/dennisguse/opentracks/content/data/Speed.java

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import java.time.Duration;
 import java.util.Objects;
 
+import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 public class Speed {
@@ -25,6 +26,10 @@ public class Speed {
         return of(Float.parseFloat(speed_mps));
     }
 
+    public static Speed ofKMH(double speed_kmh) {
+        return of(Distance.ofKilometer(speed_kmh), Duration.ofHours(1));
+    }
+
     public static Speed zero() {
         return of(0.0);
     }
@@ -42,10 +47,6 @@ public class Speed {
         return Speed.of(Math.abs(speed1.speed_mps - speed2.speed_mps));
     }
 
-
-    // Anything faster than that (in meters per second) will be considered moving.
-    private static final double MAX_NO_MOVEMENT_SPEED = 0.224;
-
     private final double speed_mps;
 
     private Speed(double speed_mps) {
@@ -65,7 +66,7 @@ public class Speed {
     }
 
     public boolean isMoving() {
-        return !isInvalid() && speed_mps >= MAX_NO_MOVEMENT_SPEED;
+        return !isInvalid() && greaterThan(PreferencesUtils.getIdleSpeed());
     }
 
     public boolean lessThan(Speed speed) {

src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java

@@ -349,19 +349,6 @@ public class TrackPoint {
         return this;
     }
 
-    public TrackPoint minusCumulativeSensorData(@NonNull TrackPoint lastTrackPoint) {
-        if (hasSensorDistance() && lastTrackPoint.hasSensorDistance()) {
-            sensorDistance = sensorDistance.minus(lastTrackPoint.getSensorDistance());
-        }
-        if (hasAltitudeGain() && lastTrackPoint.hasAltitudeGain()) {
-            altitudeGain_m -= lastTrackPoint.altitudeGain_m;
-        }
-        if (hasAltitudeLoss() && lastTrackPoint.hasAltitudeLoss()) {
-            altitudeLoss_m -= lastTrackPoint.altitudeLoss_m;
-        }
-        return this;
-    }
-
     public boolean hasSensorData() {
         return hasHeartRate() || hasCadence() || hasPower();
     }

src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java

@@ -38,11 +38,6 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
         onActivityResultCustom(requestCode, resultCode, resultData);
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
     protected void onActivityResultCustom(int requestCode, int resultCode, @Nullable Intent resultData) {
         if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {

src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java

@@ -37,7 +37,6 @@ class TrackRecordingManager {
     private TrackStatisticsUpdater trackStatisticsUpdater;
 
     private boolean currentSegmentHasTrackPoint;
-    private TrackPoint lastTrackPoint;
     private TrackPoint lastStoredTrackPoint;
 
     TrackRecordingManager(Context context) {
@@ -81,13 +80,11 @@ class TrackRecordingManager {
         trackStatisticsUpdater = new TrackStatisticsUpdater(track.getTrackStatistics());
         insertTrackPoint(trackId, segmentStartTrackPoint);
         currentSegmentHasTrackPoint = false;
-        lastTrackPoint = null;
         lastStoredTrackPoint = null;    }
 
     void pause(TrackPointCreator trackPointCreator) {
         insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
         currentSegmentHasTrackPoint = false;
-        lastTrackPoint = null;
         lastStoredTrackPoint = null;
     }
 
@@ -97,7 +94,6 @@ class TrackRecordingManager {
 
         trackId = null;
         trackStatisticsUpdater = null;
-        lastTrackPoint = null;
         lastStoredTrackPoint = null;
         currentSegmentHasTrackPoint = false;
     }
@@ -107,7 +103,7 @@ class TrackRecordingManager {
             return null;
         }
         TrackStatisticsUpdater tmpTrackStatisticsUpdater = new TrackStatisticsUpdater(trackStatisticsUpdater);
-        Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint);
+        Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastStoredTrackPoint);
 
         tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval);
 
@@ -172,7 +168,6 @@ class TrackRecordingManager {
         }
 
         Log.d(TAG, "Not recording TrackPoint, idle");
-        lastTrackPoint = trackPoint;
         return false;
     }
 
@@ -181,22 +176,6 @@ class TrackRecordingManager {
     }
 
     private void insertTrackPoint(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
-        if (lastTrackPoint != null) {
-            if (lastStoredTrackPoint != null && lastTrackPoint.getTime().equals(lastStoredTrackPoint.getTime())) {
-                // Do not insert if inserted already
-                Log.w(TAG, "Ignore insertTrackPoint. trackPoint time same as last valid trackId point time.");
-            } else {
-                insertTrackPointHelper(trackId, lastTrackPoint);
-                // Remove the sensorDistance from trackPoint that is already going  be stored with lastTrackPoint.
-                trackPoint.minusCumulativeSensorData(lastTrackPoint);
-            }
-            lastTrackPoint = null;
-        }
-
-        insertTrackPointHelper(trackId, trackPoint);
-    }
-
-    private void insertTrackPointHelper(@NonNull Track.Id trackId, @NonNull TrackPoint trackPoint) {
         try {
             contentProviderUtils.insertTrackPoint(trackPoint, trackId);
             trackStatisticsUpdater.addTrackPoint(trackPoint, recordingDistanceInterval);

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -99,7 +99,6 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            Context context = TrackRecordingService.this;
             if (PreferencesUtils.isKey(R.string.stats_units_key, key)) {
                 boolean metricUnits = PreferencesUtils.isMetricUnits();
                 notificationManager.setMetricUnits(metricUnits);

src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java

@@ -74,9 +74,7 @@ public class TrackPointCreator {
         altitudeSumManager.reset();
     }
 
-    //TODO TrackPoint should be created by TrackPointCreator; instead of in the TrackRecordingService.
-    @Deprecated
-    public SensorDataSet fill(TrackPoint trackPoint) {
+    private SensorDataSet fill(TrackPoint trackPoint) {
         SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint);
         altitudeSumManager.fill(trackPoint);
 

src/main/java/de/dennisguse/opentracks/services/tasks/VoiceAnnouncementManager.java

@@ -23,7 +23,6 @@ import androidx.annotation.VisibleForTesting;
 
 import java.time.Duration;
 
-import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Track;
 import de.dennisguse.opentracks.services.TrackRecordingService;
@@ -63,13 +62,8 @@ public class VoiceAnnouncementManager {
         voiceAnnouncement.start();
 
         this.trackStatistics = trackStatistics;
-
-        if (!totalTimeFrequency.isZero()) {
-            nextTotalTime = calculateNextDuration();
-        }
-        if (!distanceFrequency.isZero()) {
-            nextTotalDistance = calculateNextTaskDistance();
-        }
+        updateNextDuration();
+        updateNextTaskDistance();
     }
 
     public void update(@NonNull Track track) {
@@ -81,11 +75,11 @@ public class VoiceAnnouncementManager {
         boolean announce = false;
         this.trackStatistics = track.getTrackStatistics();
         if (trackStatistics.getTotalDistance().greaterThan(nextTotalDistance)) {
-            nextTotalDistance = calculateNextTaskDistance();
+            updateNextTaskDistance();
             announce = true;
         }
         if (!trackStatistics.getTotalTime().minus(nextTotalTime).isNegative()) {
-            nextTotalTime = calculateNextDuration();
+            updateNextDuration();
             announce = true;
         }
 
@@ -111,27 +105,29 @@ public class VoiceAnnouncementManager {
         restore(this.trackStatistics);
     }
 
-    @VisibleForTesting
-    public Distance calculateNextTaskDistance() {
-        if (trackStatistics == null) {
-            return DISTANCE_OFF;
+    public void updateNextTaskDistance() {
+        if (trackStatistics == null || distanceFrequency.isZero()) {
+            nextTotalDistance = DISTANCE_OFF;
+        } else {
+
+            Distance distance = trackStatistics.getTotalDistance();
+
+            int index = (int) (distance.dividedBy(distanceFrequency));
+            nextTotalDistance = distanceFrequency.multipliedBy(index + 1);
         }
 
-        Distance distance = trackStatistics.getTotalDistance();
-
-        int index = (int) (distance.dividedBy(distanceFrequency));
-        return distanceFrequency.multipliedBy(index + 1);
     }
 
-    private Duration calculateNextDuration() {
-        if (trackStatistics == null) {
-            return TOTALTIME_OFF;
+    private void updateNextDuration() {
+        if (trackStatistics == null || totalTimeFrequency.isZero()) {
+            nextTotalTime = TOTALTIME_OFF;
+        } else {
+
+            Duration totalTime = trackStatistics.getTotalTime();
+            Duration intervalMod = Duration.ofMillis(trackStatistics.getTotalTime().toMillis() % totalTimeFrequency.toMillis());
+
+            nextTotalTime = totalTime.plus(totalTimeFrequency.minus(intervalMod));
         }
-
-        Duration totalTime = trackStatistics.getTotalTime();
-        Duration intervalMod = Duration.ofMillis(trackStatistics.getTotalTime().toMillis() % totalTimeFrequency.toMillis());
-
-        return totalTime.plus(totalTimeFrequency.minus(intervalMod));
     }
 
     @VisibleForTesting

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

@@ -74,5 +74,8 @@ public class GpsSettingsFragment extends PreferenceFragmentCompat {
 
         ListPreference recordingGpsAccuracy = findPreference(getString(R.string.recording_gps_accuracy_key));
         recordingGpsAccuracy.setEntries(PreferencesUtils.getThresholdHorizontalAccuracyEntries());
+
+        ListPreference idleSpeed = findPreference(getString(R.string.idle_speed_key));
+        idleSpeed.setEntries(PreferencesUtils.getIdleSpeedEntries());
     }
 }

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

@@ -1,10 +1,7 @@
 package de.dennisguse.opentracks.settings;
 
 import android.os.Bundle;
-import android.util.Log;
 
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import de.dennisguse.opentracks.R;

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

@@ -42,6 +42,7 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.DataField;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.Layout;
+import de.dennisguse.opentracks.content.data.Speed;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.util.CsvConstants;
 import de.dennisguse.opentracks.util.TrackIconUtils;
@@ -448,6 +449,43 @@ public class PreferencesUtils {
     }
 
 
+    public static Speed getIdleSpeed() {
+        final float DEFAULT = Float.parseFloat(resources.getString(R.string.idle_speed_default));
+        float value = getFloat(R.string.idle_speed_key, DEFAULT);
+        return Speed.ofKMH(value);
+    }
+
+    static String[] getIdleSpeedEntries() {
+        String[] entryValues = resources.getStringArray(R.array.idle_speed_values);
+        String[] entries = new String[entryValues.length];
+
+        final float idleSpeedDefault = Float.parseFloat(resources.getString(R.string.idle_speed_default));
+
+        boolean metricUnits = isMetricUnits();
+
+        for (int i = 0; i < entryValues.length; i++) {
+            float value = Float.parseFloat(entryValues[i]);
+            if (metricUnits) {
+                if (value == idleSpeedDefault) {
+                    entries[i] = resources.getString(R.string.value_float_kilometer_hour_recommended, value);
+                } else {
+                    entries[i] = resources.getString(R.string.value_float_kilometer_hour, value);
+                }
+            } else {
+                double valueMPH = Speed.ofKMH(value).toMPH();
+
+                if (value == idleSpeedDefault) {
+                    entries[i] = resources.getString(R.string.value_float_mile_hour_recommended, valueMPH);
+                } else {
+                    entries[i] = resources.getString(R.string.value_float_mile_hour, valueMPH);
+                }
+            }
+        }
+
+        return entries;
+    }
+
+
     public static boolean shouldInstantExportAfterWorkout(Context context) {
         final boolean INSTANT_POST_WORKOUT_EXPORT_DEFAULT = resources.getBoolean(R.bool.post_workout_export_enabled_default);
         return getBoolean(R.string.post_workout_export_enabled_key, INSTANT_POST_WORKOUT_EXPORT_DEFAULT) && isDefaultExportDirectoryUri(context);

src/main/java/de/dennisguse/opentracks/util/ActivityUtils.java

@@ -3,7 +3,6 @@ package de.dennisguse.opentracks.util;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
@@ -15,7 +14,6 @@ import android.view.MenuItem;
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SearchView;
 
 import java.util.ArrayList;

src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java

@@ -175,8 +175,8 @@ public class BluetoothUtils {
             index += 2;
         }
 
-        if (hasTotalDistance && valueLength - index >= 2) {
-            totalDistance = Distance.ofDM(characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index));
+        if (hasTotalDistance && valueLength - index >= 4) {
+            totalDistance = Distance.ofDM(characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, index));
         }
 
         return new SensorDataRunning(address, sensorName, speed, cadence, totalDistance);

src/main/java/de/dennisguse/opentracks/util/StatisticsUtils.java

@@ -13,7 +13,7 @@ import de.dennisguse.opentracks.settings.PreferencesUtils;
 public class StatisticsUtils {
 
     public static String emptyValue(@NonNull Context context, @NonNull String statTitle) {
-        if (PreferencesUtils.isKey(R.string.stats_custom_layout_total_time_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_moving_time_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_moving_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_fastest_pace_key, statTitle)) {
+        if (PreferencesUtils.isKey(R.string.stats_custom_layout_total_time_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_moving_time_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_moving_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_fastest_pace_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_clock_key, statTitle)) {
             return context.getString(R.string.stats_empty_value_time);
         } else if (PreferencesUtils.isKey(R.string.stats_custom_layout_distance_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_speed_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_speed_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_max_speed_key, statTitle) || PreferencesUtils.isKey(R.string.stats_custom_layout_average_moving_speed_key, statTitle)) {
             return context.getString(R.string.stats_empty_value_float);

src/main/java/de/dennisguse/opentracks/viewmodels/IntervalStatistics.java

@@ -163,8 +163,13 @@ public class IntervalStatistics {
             time = time.plus(trackStatistics.getTotalTime());
             gain_m = trackStatistics.hasTotalAltitudeGain() ? trackStatistics.getTotalAltitudeGain() : gain_m;
             loss_m = trackStatistics.hasTotalAltitudeLoss() ? trackStatistics.getTotalAltitudeLoss() : loss_m;
-            if (hasGain() && lastTrackPoint != null && lastTrackPoint.hasAltitudeGain()) {
+            if (lastTrackPoint == null) {
+                return;
+            }
+            if (hasGain() && lastTrackPoint.hasAltitudeGain()) {
                 gain_m = gain_m - lastTrackPoint.getAltitudeGain();
+            }
+            if (hasLoss() && lastTrackPoint.hasAltitudeLoss()) {
                 loss_m = loss_m - lastTrackPoint.getAltitudeLoss();
             }
         }

src/main/java/de/dennisguse/opentracks/viewmodels/StatisticDataBuilder.java

@@ -60,7 +60,7 @@ public class StatisticDataBuilder {
 
             if (sensorDataSet != null && sensorDataSet.getSpeed() != null) {
                 valueAndUnit = StringUtils.getSpeedParts(context, sensorDataSet.getSpeed().first, metricUnits, reportSpeed);
-                description = context.getString(R.string.description_speed_source_sensor, sensorDataSet.getSpeed().second);
+                description = sensorDataSet.getSpeed().second;
             } else {
                 Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
                 valueAndUnit = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed);
@@ -137,6 +137,9 @@ public class StatisticDataBuilder {
                 valueAndUnit = StringUtils.getPowerParts(context, null);
                 description = sensorUnknown;
             }
+        } else if (fieldKey.equals(context.getString(R.string.stats_custom_layout_clock_key))) {
+            title = context.getString(R.string.stats_clock);
+            valueAndUnit = new Pair<>(null, null);
         }
 
         if (valueAndUnit == null) {

src/main/res/layout/custom_stats_item.xml

@@ -26,7 +26,7 @@
             android:id="@+id/stats_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            layout="@layout/stats_item"
+            layout="@layout/stats_generic_item"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toEndOf="@id/stats_iv_drag_indicator"
             app:layout_constraintEnd_toStartOf="@id/stats_icon_show_status"

src/main/res/layout/stats_clock_item.xml

@@ -0,0 +1,28 @@
+<?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="wrap_content"
+    android:paddingBottom="16dp"
+    android:paddingTop="16dp">
+
+    <TextClock
+        android:id="@+id/stats_clock"
+        style="@style/StatsPrimaryValue"
+        android:value="@string/value_unknown"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="00:00" />
+
+    <TextView
+        android:id="@+id/stats_description_main"
+        style="@style/StatsPrimaryLabel"
+        android:text="@string/stats_clock"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/stats_clock" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -472,7 +472,6 @@
     <string name="settings_sensor_running_speed_and_cadence">Correr: Distancia, velocidad y cadencia</string>
     <string name="stats_coordinates">Latitud/Longitud</string>
     <string name="location_coordinate">%1$s°</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="title_activity_settings_custom_layout">Personalizar distribución de grabación</string>
     <string name="generic_choose_an_option">Selecciona una opción</string>
     <string name="settings_sensor_cycling_distance_speed">Ciclismo: Distancia y velocidad</string>

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

@@ -456,7 +456,7 @@ limitations under the License.
     <string name="settings_night_mode_title">Vzhled</string>
     <string name="settings_night_mode_option_day">Světlý</string>
     <string name="settings_night_mode_option_night">Tmavý</string>
-    <string name="settings_sensor_wheel_circumference">Obvod kola (mm)</string>
+    <string name="settings_sensor_wheel_circumference">Obvod kolečka (mm)</string>
     <string name="stats_split_interval">Rozdělit interval</string>
     <string name="track_detail_intervals_tab">Intervaly</string>
     <string name="voice_pace_lap">Čas na kolo %1$s</string>
@@ -513,9 +513,9 @@ limitations under the License.
     <string name="delete_service">Služba mazání</string>
     <string name="menu_voice_rate">Rychlost hlasových oznámení</string>
     <string name="track_delete_not_recording">Není možno vymazat aktuálně zaznamenávanou trasu.</string>
-    <string name="settings_sensor_cycling_distance_speed">Cyklistika: vzdálenost a rychlost</string>
-    <string name="settings_sensor_cycling_cadence">Cyklistika: kadence</string>
-    <string name="settings_sensor_running_speed_and_cadence">Běh: vzdálenost, rychlost a kadence</string>
+    <string name="settings_sensor_cycling_distance_speed">Vzdálenost a rychlost</string>
+    <string name="settings_sensor_cycling_cadence">Kadence</string>
+    <string name="settings_sensor_running_speed_and_cadence">Vzdálenost, rychlost a kadence</string>
     <string name="settings_recording_customize_layout_title">Přizpůsobit vzhled měření</string>
     <string name="settings_recording_customize_layout_select_columns">Počet polí na řádek</string>
     <string name="title_activity_settings_custom_layout">Přizpůsobit vzhled měření</string>
@@ -524,7 +524,7 @@ limitations under the License.
     <string name="field_remove_from_layout">Odstranit</string>
     <string name="settings_announcements_totaltime_frequency">Časový interval</string>
     <string name="settings_announcements_distance_frequency">Interval vzdálenosti</string>
-    <string name="settings_all_reset">Resetovat všechna nastavení</string>
+    <string name="settings_all_reset">Obnovení</string>
     <string name="settings_announcements">Oznámení</string>
     <string name="settings_layout_reset">Nastavit výchozí vzhled</string>
     <string name="settings_layout_reset_confirm_message">Všechna nastavení vzhledu se vrátí na výchozí hodnoty. Nebudou tím odstraněny žádné zaznamenané aktivity v zařízení.</string>
@@ -532,9 +532,22 @@ limitations under the License.
     <string name="settings_layout_reset_done">Všechna nastavení vzhledu byla vrácena na výchozí hodnoty</string>
     <string name="stats_coordinates">Zeměpisná šířka a délka</string>
     <string name="stats_sensors_cadence">Kadence</string>
-    <string name="description_speed_source_sensor">Senzor: %1$s</string>
     <string name="description_speed_source_gps">GPS</string>
     <string name="generic_choose_an_option">Zvolit možnost</string>
     <string name="permission_bluetooth_failed">OpenTracks vyžaduje povolení k používání Bluetoothu.</string>
     <string name="stats_sensors_heart_rate">Tep</string>
+    <string name="location_coordinate">%1$s°</string>
+    <string name="location_latitude_longitude">%1$s, %2$s</string>
+    <string name="settings_generic_sensor">Generické</string>
+    <string name="settings_cycling_sensor">Cyklistika</string>
+    <string name="settings_running_sensor">Běh</string>
+    <string name="settings_import_section">Importovat</string>
+    <string name="settings_export_section">Exportovat</string>
+    <string name="stats_sensors_power">Napájení</string>
+    <string name="permission_bluetooth_failed_rejected">V nastavení systému je třeba ručně povolit aplikaci OpenTracks přístup k blízkým zařízením.</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mil/h (doporučeno)</string>
+    <string name="settings_recording_idle_speed_title">Prahová hodnota volnoběhu</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (doporučeno)</string>
 </resources>

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

@@ -526,7 +526,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="location_coordinate">%1$s°</string>
     <string name="location_latitude_longitude">%1$s, %2$s</string>
     <string name="field_remove_from_layout">Remover</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="generic_choose_an_option">Seleccione una opción</string>
     <string name="settings_layout_reset">Restabecer pantalla personalizada</string>
     <string name="stats_coordinates">Latitud/Longitud</string>

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

@@ -514,7 +514,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="stats_coordinates">Latitude/Longitude</string>
     <string name="field_set_secondary">Secondaire</string>
     <string name="field_remove_from_layout">Retirer</string>
-    <string name="description_speed_source_sensor">Capteur : %1$s</string>
     <string name="description_speed_source_gps">GPS</string>
     <string name="generic_choose_an_option">Choisissez une option</string>
     <string name="stats_sensors_heart_rate">Fréquence cardiaque</string>

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

@@ -515,7 +515,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="settings_sensor_cycling_distance_speed">Distancia e Velocidade</string>
     <string name="settings_sensor_cycling_cadence">Cadencia</string>
     <string name="settings_sensor_running_speed_and_cadence">Distancia, Velocidade e Cadencia</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="settings_recording_customize_layout_title">Personaliza a disposición da gravación</string>
     <string name="settings_layout_reset_confirm_message">Os axustes da disposición volverán aos valores por defecto. Esto non eliminará as rutas no dispositivo.</string>
     <string name="stats_coordinates">Latitude/Lonxitude</string>
@@ -545,4 +544,9 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="settings_announcements_distance_frequency">Intervalo de distancia</string>
     <string name="permission_bluetooth_failed">OpenTracks require permiso para usar o Bluetooth.</string>
     <string name="permission_bluetooth_failed_rejected">Tes que permitirlle a OpenTracks nos axustes do sistema que acceda a Dispositivos Próximos.</string>
+    <string name="settings_recording_idle_speed_title">Ocioso límite de velocidade</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_mile_hour">%1$.1f km/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f km/h (recomendado)</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recomendado)</string>
 </resources>

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

@@ -503,7 +503,6 @@ limitations under the License.
     <string name="settings_sensor_cycling_cadence">Kadens</string>
     <string name="settings_sensor_cycling_distance_speed">Distanse og hastighet</string>
     <string name="settings_sensor_running_speed_and_cadence">Distanse, hastighet og kadens</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="settings_recording_customize_layout_title">Tilpass opptakslayouten</string>
     <string name="settings_layout_reset_confirm_message">Alle layoutinnstillinger blir tilbakestilt til standardverdiene. Dette vil ikke slette spor på enheten.</string>
     <string name="stats_coordinates">Breddegrad/Lengdegrad</string>
@@ -533,4 +532,9 @@ limitations under the License.
     <string name="settings_running_sensor">Løping</string>
     <string name="settings_import_section">Import</string>
     <string name="settings_export_section">Eksport</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/t</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/t (anbefales)</string>
+    <string name="settings_recording_idle_speed_title">Terskel for tomgangshastighet</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mi/h (anbefales)</string>
 </resources>

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

@@ -434,7 +434,7 @@
     <string name="sensor_state_heart_rate_avg">Ritmo cardíaco Avg</string>
     <string name="sensor_state_cadence_max">Ritmo cardíaco médio</string>
     <string name="sensor_state_cadence_avg">Avg Cadência</string>
-    <string name="settings_sensor_wheel_circumference">Circunferência da roda (mm)</string>
+    <string name="settings_sensor_wheel_circumference">Circunferência da Roda (mm)</string>
     <string name="track_distance_notification">Distância: %1$s</string>
     <string name="track_speed_notification">Velocidade: %1$s</string>
     <string name="track_pace_notification">Parcela: %1$s</string>
@@ -451,11 +451,10 @@
         <item quantity="one">%1$.1f milha por hora</item>
         <item quantity="other">%1$.1f milhas por hora</item>
     </plurals>
-    <string name="settings_sensor_cycling_cadence">Ciclismo: cadência</string>
-    <string name="settings_sensor_cycling_distance_speed">Ciclismo: distância e velocidade</string>
-    <string name="settings_sensor_running_speed_and_cadence">Corrida: distância, velocidade e cadência</string>
+    <string name="settings_sensor_cycling_cadence">Cadência</string>
+    <string name="settings_sensor_cycling_distance_speed">Distância e velocidade</string>
+    <string name="settings_sensor_running_speed_and_cadence">Distância, velocidade e cadência</string>
     <string name="stats_sensors_cadence">Cadência</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="description_speed_source_gps">GPS</string>
     <string name="settings_recording_customize_layout_title">Personalize seu layout de gravação</string>
     <string name="settings_recording_customize_layout_select_columns">Campos de dados por linha</string>
@@ -464,7 +463,7 @@
     <string name="settings_announcements_distance_frequency">Intervalo de distância</string>
     <string name="settings_layout_reset_confirm_title">Redefinir seus layouts\?</string>
     <string name="settings_layout_reset_done">Todas as configurações de layout foram revertidas para os valores padrão</string>
-    <string name="settings_all_reset">Redefinir todas as configurações</string>
+    <string name="settings_all_reset">Redefinir</string>
     <string name="stats_coordinates">Latitude/Longitude</string>
     <string name="stats_sensors_power">Poder</string>
     <string name="location_coordinate">%1$s°</string>
@@ -479,4 +478,14 @@
     <string name="settings_layout_reset">Redefinir layout personalizado</string>
     <string name="settings_layout_reset_confirm_message">Todas as configurações de layout serão revertidas para os valores padrão. Isso não excluirá nenhuma trilha do dispositivo.</string>
     <string name="stats_sensors_heart_rate">Frequência cardíaca</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mi/h (Recomendado)</string>
+    <string name="settings_generic_sensor">Genérico</string>
+    <string name="settings_cycling_sensor">Ciclismo</string>
+    <string name="settings_running_sensor">Correndo</string>
+    <string name="settings_import_section">Importar</string>
+    <string name="settings_export_section">Exportar</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (Recomendado)</string>
+    <string name="settings_recording_idle_speed_title">Limite de velocidade de marcha lenta</string>
 </resources>

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

@@ -384,7 +384,7 @@ limitations under the License.
     <string name="generic_overwrite">Ghi đè</string>
     <string name="menu_voice_rate">Tốc độ giọng nói</string>
     <string name="open_track_as_GPX">Mở dưới dạng GPX</string>
-    <string name="help_recording_content">OpenTracks sử dụng cảm biến GPS của thiết bị để liên tục ghi lại vị trí. Nếu thiết bị GPS báo cáo dữ liệu không chính xác (vd: vị trí, tốc độ, độ cao), OpenTracks không thể làm gì để khắc phục cả.</string>
+    <string name="help_recording_content">OpenTracks sử dụng các bộ cảm biến GPS của điện thoại để ghi lại vị trí liên tục. Nếu các thiết bị GPS báo cáo dữ liệu không chính xác (ví dụ như, vị trí, tốc độ, độ cao), OpenTracks không thể làm bất cứ điều gì về nó.</string>
     <string name="gps_fixed_and_ready">GPS đã xác định và sẵn sàng</string>
     <string name="generic_skip">Bỏ qua</string>
     <string name="import_unsupported_format">Định dạng tệp không được hỗ trợ</string>
@@ -510,7 +510,6 @@ limitations under the License.
     <string name="track_delete_progress">%1$d/%2$d</string>
     <string name="settings_recording_keep_screen_on_while_recording_title">Giữ trên màn hình</string>
     <string name="bluetooth_disabled">Xin vui lòng cho phép Bluetooth.</string>
-    <string name="description_speed_source_sensor">Cảm biến: %1$s</string>
     <string name="sensor_state_cadence_avg">Nhịp trung bình</string>
     <string name="sensor_state_cadence_max">Nhịp tối đa</string>
     <string name="sensor_state_heart_rate_avg">Nhịp tim trung bình</string>
@@ -524,4 +523,9 @@ limitations under the License.
     <string name="settings_import_section">Nhập</string>
     <string name="settings_export_section">Xuất</string>
     <string name="settings_generic_sensor">Chung chung</string>
+    <string name="settings_recording_idle_speed_title">Tốc độ ngưỡng</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mi/h (khuyến khích)</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (khuyến khích)</string>
 </resources>

src/main/res/values/settings.xml

@@ -194,6 +194,21 @@
         <item>@string/recording_gps_accuracy_poor</item>
     </string-array>
 
+    <string name="idle_speed_key" translatable="false">idleSpeed</string>
+    <string name="idle_speed_default" translatable="false">0.5</string>
+    <string-array name="idle_speed_values">
+        <item>0.3</item>
+        <item>@string/idle_speed_default</item>
+        <item>1</item>
+        <item>1.5</item>
+        <item>2</item>
+        <item>2.5</item>
+        <item>3</item>
+        <item>3.5</item>
+        <item>4</item>
+        <item>5</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_imperial_options">
@@ -339,6 +354,7 @@
     <string name="stats_custom_layout_cadence_key" translatable="false">cadence</string>
     <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>
     <!--
     Default dataFields for stats layout customization in a set of arrays.
     Every array has two items:
@@ -418,6 +434,10 @@
         <item>@string/stats_custom_layout_power_key</item>
         <item>0,0,0</item>
     </string-array>
+    <string-array name="stats_custom_layout_fields_default_value_18">
+        <item>@string/stats_custom_layout_clock_key</item>
+        <item>0,0,0</item>
+    </string-array>
 
     <!-- Stats empty values -->
     <string name="stats_empty_value_integer" translatable="false">0</string>

src/main/res/values/strings.xml

@@ -196,7 +196,6 @@ limitations under the License.
     <string name="description_time">Time</string>
     <string name="description_total_distance">Total distance: %1$.2f km (%2$.1f mi)</string>
     <string name="description_total_time">Total time: %1$s</string>
-    <string name="description_speed_source_sensor">Sensor: %1$s</string>
     <string name="description_speed_source_gps">GPS</string>
     <!-- Export -->
     <string name="export_with_photos">with photos</string>
@@ -357,6 +356,7 @@ limitations under the License.
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
+    <string name="settings_recording_idle_speed_title">Idle speed threshold</string>
     <string name="settings_night_mode_title">UI Theme</string>
     <string name="settings_night_mode_option_system">System</string>
     <string name="settings_night_mode_option_day">Day</string>
@@ -428,6 +428,7 @@ limitations under the License.
     <string name="stats_sensors_heart_rate">Heart Rate</string>
     <string name="stats_sensors_cadence">Cadence</string>
     <string name="stats_sensors_power">Power</string>
+    <string name="stats_clock">Clock</string>
     <!-- Track -->
     <string name="track_name_format">Track %1$d</string>
     <string name="track_recording_notification_accuracy">Location accuracy: %1$s</string>
@@ -473,12 +474,16 @@ limitations under the License.
     <string name="value_integer_feet_recommended">%1$d ft (recommended)</string>
     <string name="value_integer_kilometer">%1$d km</string>
     <string name="value_integer_kilometer_hour">%1$d km/h</string>
+    <string name="value_float_kilometer_hour">%1$.1f km/h</string>
+    <string name="value_float_kilometer_hour_recommended">%1$.1f km/h (recommended)</string>
     <string name="value_integer_meter">%1$d m</string>
     <string name="value_integer_meter_excellent_gps">%1$d m (excellent GPS)</string>
     <string name="value_integer_meter_poor_gps">%1$d m (poor GPS)</string>
     <string name="value_integer_meter_recommended">%1$d m (recommended)</string>
     <string name="value_integer_mile">%1$d mi</string>
     <string name="value_integer_mile_hour">%1$d mi/h</string>
+    <string name="value_float_mile_hour">%1$.1f mi/h</string>
+    <string name="value_float_mile_hour_recommended">%1$.1f mi/h (recommended)</string>
     <string name="value_integer_minute">%1$d min</string>
     <string name="value_integer_second">%1$d s</string>
     <string name="value_none">None</string>

src/main/res/values/themes_custom.xml

@@ -25,12 +25,6 @@ limitations under the License.
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="TrackDeleteActivity" parent="ThemeCustom">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowIsFloating">true</item>
-    </style>
-
     <style name="SplashTheme" parent="ThemeCustom">
         <item name="android:statusBarColor">@color/splashscreen_background</item>
         <item name="android:navigationBarColor">@color/splashscreen_background</item>

src/main/res/xml/settings_gps.xml

@@ -27,4 +27,10 @@
         android:key="@string/recording_gps_accuracy_key"
         android:title="@string/settings_recording_min_required_accuracy_title" />
 
+    <ListPreference
+        android:defaultValue="@string/idle_speed_default"
+        android:entryValues="@array/idle_speed_values"
+        android:key="@string/idle_speed_key"
+        android:title="@string/settings_recording_idle_speed_title" />
+
 </PreferenceScreen>