diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java deleted file mode 100644 index 648c5beef..000000000 --- a/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * 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. - */ -package de.dennisguse.opentracks.services; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import java.time.Duration; - -import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy; - -import static org.junit.Assert.assertEquals; - -/** - * Tests the {@link AdaptiveLocationListenerPolicy}. - * - * @author youtaol - */ -@RunWith(JUnit4.class) -public class AdaptiveLocationListenerPolicyTest { - - private static final Duration MIN = Duration.ofMillis(1000); - private static final Duration MAX = Duration.ofMillis(3000); - private static final int MIN_DISTANCE = 10; - private static final Duration NEW_IDLE_TIME_BIG = Duration.ofMillis(10000); - private static final Duration NEW_IDLE_TIME_NORMAL = Duration.ofMillis(5000); - private static final Duration NEW_IDLE_TIME_SMALL = Duration.ofMillis(2000); - private static final Duration NEW_IDLE_TIME_LESS_THAN_MIN = Duration.ofMillis(500); - private AdaptiveLocationListenerPolicy adaptiveLocationListenerPolicy; - - @Before - public void setUp() { - adaptiveLocationListenerPolicy = new AdaptiveLocationListenerPolicy(MIN, MAX, MIN_DISTANCE); - } - - /** - * Tests the {@link AdaptiveLocationListenerPolicy#getDesiredPollingInterval()} in four situations. - * - */ - @Test - public void testGetDesiredPollingInterval() { - adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG); - assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); - - adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL); - // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second. - assertEquals(NEW_IDLE_TIME_NORMAL.dividedBy(2).getSeconds(), adaptiveLocationListenerPolicy.getDesiredPollingInterval().getSeconds()); - - adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL); - assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); - - adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN); - assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); - } - - /** - * Tests the method {@link AdaptiveLocationListenerPolicy#getMinDistance_m()}. - */ - @Test - public void testGetMinDistance() { - assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m()); - } -} diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/AbsoluteLocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/handlers/AbsoluteLocationListenerPolicy.java deleted file mode 100644 index 92d548f9a..000000000 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/AbsoluteLocationListenerPolicy.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * 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. - */ - -package de.dennisguse.opentracks.services.handlers; - -import java.time.Duration; - -/** - * This is a simple location listener policy that will always dictate the same polling interval. - * - * @author Sandor Dornbush - */ -public class AbsoluteLocationListenerPolicy implements LocationListenerPolicy { - - private final Duration interval; - - /** - * Constructor. - * - * @param interval the interval to request for gps signal - */ - public AbsoluteLocationListenerPolicy(Duration interval) { - this.interval = interval; - } - - @Override - public Duration getDesiredPollingInterval() { - return interval; - } - - @Override - public int getMinDistance_m() { - return 0; - } - - @Override - public void updateIdleTime(Duration idleTime) { - // Ignore - } -} diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/AdaptiveLocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/handlers/AdaptiveLocationListenerPolicy.java deleted file mode 100644 index 66bf8b331..000000000 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/AdaptiveLocationListenerPolicy.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * 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. - */ - -package de.dennisguse.opentracks.services.handlers; - -import java.time.Duration; - -/** - * A {@link LocationListenerPolicy} that will change based on how long the user has been stationary. - * This policy will dictate a policy based on a min, max and idle time. - * The policy will dictate an interval bounded by min and max, and is half of the idle time. - * - * @author Sandor Dornbush - */ -public class AdaptiveLocationListenerPolicy implements LocationListenerPolicy { - - private final Duration minInterval; - private final Duration maxInterval; - private final int minDistance_m; - - // The time the user has been idle at the current location, in milliseconds. - private Duration idleTime; - - /** - * Creates a policy that will be bounded by the given minInterval_ms and maxInterval_ms. - * - * @param minInterval the smallest interval this policy will dictate - * @param maxInterval the largest interval this policy will dictate - * @param minDistance_m the minimum distance - */ - public AdaptiveLocationListenerPolicy(Duration minInterval, Duration maxInterval, int minDistance_m) { - this.minInterval = minInterval; - this.maxInterval = maxInterval; - this.minDistance_m = minDistance_m; - } - - /* - * Returns an interval half of the idle time, but bounded by minInterval and maxInterval. - */ - public Duration getDesiredPollingInterval() { - Duration desiredInterval = idleTime.dividedBy(2); - - // Round to second to avoid setting the interval too often - desiredInterval = Duration.ofSeconds(desiredInterval.getSeconds()); - - if (minInterval.compareTo(desiredInterval) > 0) { - return minInterval; - } else if (maxInterval.compareTo(desiredInterval) < 0) { - return maxInterval; - } - return desiredInterval; - } - - @Override - public int getMinDistance_m() { - return minDistance_m; - } - - @Override - public void updateIdleTime(Duration newIdleTime) { - idleTime = newIdleTime; - } -} diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java index 9458f8c3f..a4b2b3c04 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/GpsStatus.java @@ -71,8 +71,8 @@ class GpsStatus { SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context); thresholdHorizontalAccuracy = PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context); - Duration minRecordingInterval = Duration.ofSeconds(PreferencesUtils.getMinRecordingInterval(sharedPreferences, context)); - signalLostThreshold = !minRecordingInterval.isNegative() ? SIGNAL_LOST_THRESHOLD.plus(minRecordingInterval) : SIGNAL_LOST_THRESHOLD; + Duration minRecordingInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context); + signalLostThreshold = SIGNAL_LOST_THRESHOLD.plus(minRecordingInterval); gpsStatusHandler = new Handler(); } @@ -102,13 +102,8 @@ class GpsStatus { thresholdHorizontalAccuracy = value; } - /** - * Method to change the lost threshold from outside. - * - * @param value Minimal recording interval preference value in seconds or an special value: -1, -2, 0. - */ - public void onMinRecordingIntervalChanged(int value) { - signalLostThreshold = value > 0 ? SIGNAL_LOST_THRESHOLD.plus(Duration.ofSeconds(value)) : SIGNAL_LOST_THRESHOLD; + public void onMinRecordingIntervalChanged(Duration value) { + signalLostThreshold = SIGNAL_LOST_THRESHOLD.plus(value); } /** diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java index 159fe9524..9d2780ac3 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java @@ -19,7 +19,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.util.LocationUtils; import de.dennisguse.opentracks.util.PreferencesUtils; -@VisibleForTesting(otherwise = 3) +@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) public class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener { private final String TAG = LocationHandler.class.getSimpleName(); @@ -27,8 +27,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis private LocationManager locationManager; private final TrackPointCreator handlerServer; private GpsStatus gpsStatus; - private LocationListenerPolicy locationListenerPolicy; - private Duration currentRecordingInterval; + private Duration gpsInterval; private Distance thresholdHorizontalAccuracy; private TrackPoint lastTrackPoint; @@ -64,32 +63,31 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis } public void onSharedPreferenceChanged(@NonNull Context context, @NonNull SharedPreferences sharedPreferences, String key) { - if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) { - int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context); - if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) { - // Choose battery life over moving time accuracy. - locationListenerPolicy = new AdaptiveLocationListenerPolicy(Duration.ofSeconds(30), Duration.ofSeconds(5), 5); - } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) { - // Get all the updates. - locationListenerPolicy = new AdaptiveLocationListenerPolicy(Duration.ofSeconds(1), Duration.ofSeconds(30), 0); - } else { - locationListenerPolicy = new AbsoluteLocationListenerPolicy(Duration.ofSeconds(minRecordingInterval)); - } + boolean registerListener = false; - registerLocationListener(); + if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) { + registerListener = true; + + gpsInterval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, context); + + if (gpsStatus != null) { + gpsStatus.onMinRecordingIntervalChanged(gpsInterval); + } } if (PreferencesUtils.isKey(context, R.string.recording_gps_accuracy_key, key)) { thresholdHorizontalAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context); } - if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) { + if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) { + registerListener = true; + if (gpsStatus != null) { - gpsStatus.onMinRecordingIntervalChanged(PreferencesUtils.getMinRecordingInterval(sharedPreferences, context)); + Distance gpsMinDistance = PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context); + gpsStatus.onRecordingDistanceChanged(gpsMinDistance); } } - if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) { - if (gpsStatus != null) { - gpsStatus.onRecordingDistanceChanged(PreferencesUtils.getRecordingDistanceInterval(sharedPreferences, context)); - } + + if (registerListener) { + registerLocationListener(); } } @@ -123,16 +121,6 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis return; } - Duration idleTime = Duration.ofSeconds(0); - if (lastTrackPoint != null && trackPoint.getTime().isAfter(lastTrackPoint.getTime())) { - idleTime = Duration.between(lastTrackPoint.getTime(), trackPoint.getTime()); - } - - locationListenerPolicy.updateIdleTime(idleTime); - if (currentRecordingInterval != locationListenerPolicy.getDesiredPollingInterval()) { - registerLocationListener(); - } - lastTrackPoint = trackPoint; handlerServer.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy); } @@ -161,9 +149,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis return; } try { - Duration interval = locationListenerPolicy.getDesiredPollingInterval(); - currentRecordingInterval = interval; - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, interval.toMillis(), locationListenerPolicy.getMinDistance_m(), this); + locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, gpsInterval.toMillis(), 0, this); } catch (SecurityException e) { Log.e(TAG, "Could not register location listener; permissions not granted.", e); } diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationListenerPolicy.java deleted file mode 100644 index f94d7b05b..000000000 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationListenerPolicy.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * 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. - */ - -package de.dennisguse.opentracks.services.handlers; - -import java.time.Duration; - -/** - * This is an interface for classes that will manage the location listener policy. - * - * @author Sandor Dornbush - */ -interface LocationListenerPolicy { - - /** - * Returns the polling interval this policy would like at this moment. - * - * @return the polling interval - */ - Duration getDesiredPollingInterval(); - - /** - * Returns the minimum distance between updates. - */ - int getMinDistance_m(); - - /** - * Notifies the amount of time the user has been idle at his current location. - * - * @param idleTime the time that the user has been idle at his current location - */ - void updateIdleTime(Duration idleTime); -} diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java index ff6cacff5..e383507cb 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferenceHelper.java @@ -14,11 +14,7 @@ final class PreferenceHelper { for (int i = 0; i < entryValues.length; i++) { int value = Integer.parseInt(entryValues[i]); - if (value == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) { - entries[i] = context.getString(R.string.value_adapt_accuracy); - } else if (value == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) { - entries[i] = context.getString(R.string.value_adapt_battery_life); - } else if (value == PreferencesUtils.getMinRecordingIntervalDefault(context)) { + if (value == PreferencesUtils.getMinRecordingIntervalDefault(context).getSeconds()) { entries[i] = context.getString(R.string.value_smallest_recommended); } else { entries[i] = value < 60 ? context.getString(R.string.value_integer_second, value) : context.getString(R.string.value_integer_minute, value / 60); diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index 1aa545404..99c835205 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -203,7 +203,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity findPreference(getString(R.string.min_recording_interval_key)) .setSummaryProvider( preference -> { - Duration interval = Duration.ofSeconds(PreferencesUtils.getMinRecordingInterval(sharedPreferences, getContext())); + Duration interval = PreferencesUtils.getMinRecordingInterval(sharedPreferences, getContext()); return getString(R.string.settings_recording_location_frequency_summary, getString(R.string.value_integer_second, interval.getSeconds())); } ); diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java index 7188d3665..89ee40110 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java @@ -28,6 +28,8 @@ import androidx.annotation.VisibleForTesting; import androidx.documentfile.provider.DocumentFile; import androidx.preference.PreferenceManager; +import java.time.Duration; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -241,22 +243,19 @@ public class PreferencesUtils { return Distance.of(getInt(sharedPreferences, context, R.string.max_recording_distance_key, MAX_RECORDING_DISTANCE)); } - //TODO Duration - public static int getMinRecordingInterval(SharedPreferences sharedPreferences, Context context) { - final int MIN_RECORDING_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)); - return getInt(sharedPreferences, context, R.string.min_recording_interval_key, MIN_RECORDING_INTERVAL); + public static Duration getMinRecordingInterval(SharedPreferences sharedPreferences, Context context) { + final Duration MIN_RECORDING_INTERVAL = getMinRecordingIntervalDefault(context); + Duration interval = Duration.ofSeconds(getInt(sharedPreferences, context, R.string.min_recording_interval_key, (int) MIN_RECORDING_INTERVAL.getSeconds())); + + if (interval.isNegative()) { + // Due to removal of adaptive listener policy; used -1, and -2 + interval = getMinRecordingIntervalDefault(context); + } + return interval; } - public static int getMinRecordingIntervalAdaptAccuracy(Context context) { - return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_adapt_accuracy)); - } - - public static int getMinRecordingIntervalAdaptBatteryLife(Context context) { - return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_adapt_battery_life)); - } - - public static int getMinRecordingIntervalDefault(Context context) { - return Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default)); + public static Duration getMinRecordingIntervalDefault(Context context) { + return Duration.ofSeconds(Integer.parseInt(context.getResources().getString(R.string.min_recording_interval_default))); } public static Distance getThresholdHorizontalAccuracy(SharedPreferences sharedPreferences, Context context) { diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 0fd48c5a3..87e731fc6 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -268,8 +268,6 @@ limitations under the License. د/كم دقيقة/ميل - تكييف من أجل الدقة - التكيف بحسب عمر البطارية %1$d قدم %1$d قدم (إشارة نظام تحديد المواقع ممتازة) %1$d قدم (موصى به) diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml index 062e0e5bd..0a5bb4d62 100644 --- a/src/main/res/values-b+en+001/strings.xml +++ b/src/main/res/values-b+en+001/strings.xml @@ -216,8 +216,6 @@ mi/h min/km min/mi - Adapt for accuracy - Adapt for battery life %1$d ft %1$d ft (excellent GPS) %1$d ft (recommended) diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index bbbed4b5b..a7c6c65f3 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -219,8 +219,6 @@ millas/hora min/km min/milla - Adaptar para precisión - Adaptar a la duración de la batería %1$d pies %1$d pies (señal de GPS excelente) %1$d pies (recomendado) diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index ae3c014c8..fc4be18b3 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -265,8 +265,6 @@ limitations under the License. мин/км мин/мил - Адаптиране за точност - Адаптиране спрямо батерията %1$d фт %1$d фт (отличен GPS) %1$d фт (препоръчително) diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index f2ea4a723..a4e580874 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -263,8 +263,6 @@ limitations under the License. min/km min/milles - Adapta\'n la precisió - Adapta a la durada de la bateria %1$d peus %1$d peus (senyal de GPS excel·lent) %1$d peus (recomanat) diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 562e070b7..a5edad5fc 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -333,8 +333,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs min/km min/míle - Upřednostnit přesnost - Upřednostnit výdrži baterie %1$d stop %1$d stop (vynikající signál GPS) %1$d stop (doporučeno) diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index aa92a7ff4..76564e94e 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -335,8 +335,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj min./km min./mil - Juster nøjagtighed - Tilpas til batterilevetid %1$d fod %1$d fod (fremragende GPS) %1$d fod (anbefales) diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index dfc635a50..c15917bd0 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -340,8 +340,6 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka min/km Min./Meile - Genauigkeit anpassen - An Akkulaufzeit anpassen %1$d Fuß %1$d Fuß (ausgezeichnetes GPS-Signal) %1$d Fuß (empfohlen) diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 32233fa61..3f2344860 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -264,8 +264,6 @@ limitations under the License. λεπτά / χιλ. λεπτά/μίλι - Προσαρμογή για ακρίβεια - Καλύτερο για μπατ. %1$d πόδια %1$d πόδια (τέλειο σήμα GPS) %1$d ft (συνιστάται) diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 2e25414cb..8312f8e4e 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -332,8 +332,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida min/km min/milla - Adaptar para obtener valores exactos - Adaptar a la duración de la batería %1$d pies %1$d pies (señal de GPS excelente) %1$d pies (recomendado) diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index 95e3e6668..4f485f1ed 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -332,8 +332,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s min/km min/miilis - Täpsuse kohandamine - Kohandage aku elueale %1$d jalga %1$d jalga (tugev GPS-signaal) %1$d jalga (soovitatav) diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index fbe4133b5..b0481c948 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -333,8 +333,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O min/km min/mi - Doitu zehaztasuna - Doitu bateriaren iraupenera %1$d ft %1$d ft (GPS bikaina) %1$d oin (gomendatua) diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 65e44d9b7..f4d69a333 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -264,8 +264,6 @@ limitations under the License. دقیقه در کیلومتر دقیقه در مایل - تعدیل به خاطر دقت - تعدیل به خاطر عمر باتری %1$d فوت %1$d فوت (GPS عالی) %1$d فوت (توصیه می‌شود) diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 945b4aa65..d141f12d2 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -340,8 +340,6 @@ limitations under the License. min/km min/maili - Säädä tarkkuutta - Sovita akun kestoon %1$d jalkaa %1$d jalkaa (erinomainen GPS) %1$d jalkaa (suositus) diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml index ed4b42c09..71f8f9e8c 100644 --- a/src/main/res/values-fr-rCA/strings.xml +++ b/src/main/res/values-fr-rCA/strings.xml @@ -215,8 +215,6 @@ mi/h min/km min/mi - Adapter pour la précision - Optimiser pour économiser la pile %1$d pi %1$d pi(s) (réception GPS excellente) %1$d pi (recommandé) diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml index 7ed2579c8..09bcd5c92 100644 --- a/src/main/res/values-fr-rCH/strings.xml +++ b/src/main/res/values-fr-rCH/strings.xml @@ -215,8 +215,6 @@ miles/h min/km min/mi - Adapter pour la précision - Économiser la batterie %1$d pied(s) %1$d pied(s) (réception GPS excellente) %1$d pied(s) (recommandé) diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 7f07c40f3..4d6a09fd8 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -332,8 +332,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio min/km min/mi - Adapter pour la précision - Économiser la batterie %1$d pied(s) %1$d pied(s) (réception GPS excellente) %1$d pied(s) (recommandé) diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 346fbc23e..073fe7282 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -349,8 +349,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser min/km min/km - Adaptar para obter precisión - Adaptar á duración restante da batería %1$d m %1$d m (GPS excelente) %1$d m (recomendado) diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml index b86d0506e..0a89eaa3c 100644 --- a/src/main/res/values-hi/strings.xml +++ b/src/main/res/values-hi/strings.xml @@ -264,8 +264,6 @@ limitations under the License. मि/किमी मि/मील - सटीकता के लिए ग्रहण करें - बैटरी जीवन के लिए ग्रहण करें %1$d फुट %1$d फुट (उत्कृष्ट GPS) %1$d फ़ुट (अनुशंसित) diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 77e7275f1..6672f4887 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -265,8 +265,6 @@ limitations under the License. min/km min/mi - Prilagodba radi točnosti - Prilagodi vijeku trajanja baterije %1$d ft %1$d ft (izvrstan GPS) %1$d ft (preporučeno) diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 2a3986b98..9754d7a65 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -265,8 +265,6 @@ limitations under the License. perc/km perc/mérföld - Beállítás pontossághoz - Akkumulátor élettartama szerint %1$d láb %1$d láb (kiváló GPS-jel) %1$d láb (ajánlott) diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml index 46bb75bdf..cd631a1b2 100644 --- a/src/main/res/values-in/strings.xml +++ b/src/main/res/values-in/strings.xml @@ -216,8 +216,6 @@ mph min/km mnt/mil - Sesuaikan dengan akurasi - Sesuaikan untuk masa pakai baterai %1$d kaki %1$d kaki (GPS sangat baik) %1$d kaki (direkomendasikan) diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 32fcd14ab..42d99eeda 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -307,8 +307,6 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica min/km min/mi - Adatta per la precisione - Adatta per la massima durata della batteria %1$d pd %1$d pd (GPS forte) %1$d pd (consigliato) diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 0c0a3cd8a..6af0b6b01 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -217,8 +217,6 @@ מייל/שעה דקות/ק\"מ דקות/מייל - התאם למען הדיוק - התאם לחיי הסוללה %1$d רגל %1$d רגל (GPS מעולה) %1$d רגל (מומלץ) diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 522a9a1b0..dc77bcecc 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -263,8 +263,6 @@ limitations under the License. 分/km 分/マイル - 精度を重視 - 電池残量を重視 %1$dft %1$dft（GPS信号: 強） %1$dft（推奨） diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index da6003761..a6a2b44cc 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -263,8 +263,6 @@ limitations under the License. min/km min/mi - 정확도를 위해 조정 - 배터리 수명을 위해 조정 %1$d피트 %1$d피트(GPS 수신 원활) %1$d피트(권장) diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml index e4a0964d1..2723da282 100644 --- a/src/main/res/values-lt/strings.xml +++ b/src/main/res/values-lt/strings.xml @@ -266,8 +266,6 @@ limitations under the License. min./km min./myl - Pritaikyti siekiant tikslumo - Pritaik. taus. akum %1$d pėd %1$d pėd. (puikus GPS) %1$d pėd. (rekomenduojama) diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml index 846eff2ab..96c6c7939 100644 --- a/src/main/res/values-lv/strings.xml +++ b/src/main/res/values-lv/strings.xml @@ -266,8 +266,6 @@ limitations under the License. min/km min/jūdzē - Pielāgot precizitātei - Pielāgot akumulatora darbības ilgumam %1$d pēda(-as) %1$d pēda(-as) (izcilas kvalitātes GPS) %1$d pēdas (ieteicams) diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml index ddfccb1d9..bd32c139d 100644 --- a/src/main/res/values-mo/strings.xml +++ b/src/main/res/values-mo/strings.xml @@ -216,8 +216,6 @@ mi/h min/km min/mi - Adaptaţi pentru acurateţe - Economisiţi bateria %1$d ft %1$d ft (semnal GPS excelent) %1$d ft (recomandat) diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml index 51fcc4056..dd9964b9a 100644 --- a/src/main/res/values-ms/strings.xml +++ b/src/main/res/values-ms/strings.xml @@ -263,8 +263,6 @@ limitations under the License. min/km min/bt - Sesuaikan untuk ketepatan - Sesuaikan untuk hayat bateri %1$d kaki %1$d kaki (GPS bagus) %1$d kaki (disyorkan) diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 814cf259e..3d9d4d343 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -265,8 +265,6 @@ limitations under the License. min/km min/mi - Tilpass for nøyaktighet - Tilpass for batterilevetid %1$d fot %1$d fot (utmerket GPS) %1$d fot (anbefales) diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 65f317d82..4731a1a34 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -332,8 +332,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid min/km min/mi - Aanpassen voor nauwkeurigheid - Aanpassen voor resterende accutijd %1$d ft %1$d ft (uitstekend GPS-signaal) %1$d ft (aanbevolen) diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index f877c541c..055eaa51d 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -303,8 +303,6 @@ limitations under the License. min/km min/mi - Dostosuj pod kątem dokładności - Dostosuj pod kątem żywotności baterii %1$d ft %1$d ft (doskonały sygnał GPS) %1$d ft (zalecane) diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 494bce151..67610006d 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -217,8 +217,6 @@ mph min/km min/milhas - Adaptar para fins de precisão - Adaptar à vida da bateria %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 12f6d2f6c..26470a287 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -215,8 +215,6 @@ mi/h min/km min/milha - Adaptar para precisão - Adaptar para a vida da bateria %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 3bfd5c9a3..051952e24 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -265,8 +265,6 @@ limitations under the License. min/km min/milhas - Adaptar para fins de precisão - Adaptar à vida da bateria %1$d pés %1$d pés (GPS excelente) %1$d pés (recomendado) diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index d09e06841..89db1e4ef 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -266,8 +266,6 @@ limitations under the License. min/km min/mi - Adaptaţi pentru acurateţe - Economisiţi bateria %1$d ft %1$d ft (semnal GPS excelent) %1$d ft (recomandat) diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index f5b179440..567811e4a 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -267,8 +267,6 @@ limitations under the License. мин/км мин/мил - Макс. точность - Мин. расход батареи %1$d фт %1$d фт (отличный сигнал) %1$d фт (рекомендуется) diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 6d18c9c77..3d3d231f9 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -265,8 +265,6 @@ limitations under the License. min./km min./mi. - Prispôsobiť na presnosť - Prispôsobiť na výdrž batérie %1$d st. %1$d st. (výborný signál GPS) %1$d st. (odporúčané) diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index 601183177..06debb6e7 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -267,8 +267,6 @@ limitations under the License. min/km min/mi - Prilagodi za natančnost - Prilagodi za življenjsko dobo baterije %1$d čevljev %1$d čevljev (odličen signal GPS) %1$d čevljev (priporočeno) diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index e3d1d1822..ce227b1e5 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -264,8 +264,6 @@ limitations under the License. мин/км мин/ми - Прилагоди за прецизност - Прилагоди трајању батерије %1$d ст %1$d ст (одличан GPS) %1$d ст (препоручено) diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index cd4a57dbc..da3cb7c13 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -265,8 +265,6 @@ limitations under the License. min/km min/mile - Anpassa för noggrannhet - Anpassa för batterilivslängd %1$d fot %1$d fot (utmärkt GPS-mottagning) %1$d fot (rekommenderas) diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml index b19f17776..1e00a73ef 100644 --- a/src/main/res/values-th/strings.xml +++ b/src/main/res/values-th/strings.xml @@ -262,8 +262,6 @@ limitations under the License. นาที/กม. นาที/ไมล์ - ปรับความแม่นยำ - ปรับเพื่อแบตเตอรี่ %1$d ฟุต %1$d ฟุต (สัญญาณ GPS ดี) %1$d ฟุต (แนะนำ) diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml index 556aaf66b..400d6419f 100644 --- a/src/main/res/values-tl/strings.xml +++ b/src/main/res/values-tl/strings.xml @@ -264,8 +264,6 @@ limitations under the License. min/km min/mi - Iangkop para sa katumpakan - Iangkop para sa antas ng baterya %1$d ft %1$d ft (malinaw na GPS) %1$d ft (inirerekomenda) diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 8c0cc480e..2e9583957 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -264,8 +264,6 @@ limitations under the License. dk./km dk./mil - Doğruluk için uyarla - Pil ömrü için uyarla %1$d ft %1$d ft (mükemmel GPS) %1$d ft (önerilir) diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 7d7df4e53..3f9de88cb 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -267,8 +267,6 @@ limitations under the License. хв/км хв./милю - Адаптувати для точності - Адаптувати до часу роботи батареї %1$d фут %1$d фут. (відмінний сигнал GPS) %1$d фут. (рекомендовано) diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 6dce5aa21..f9f6b57b7 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -264,8 +264,6 @@ limitations under the License. phút/km phút/dặm - Thích ứng với độ chính xác - Thích ứng với tuổi thọ pin %1$d ft %1$d ft (tín hiệu GPS tốt) %1$d ft (được đề nghị) diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml index 395437629..a634e471b 100644 --- a/src/main/res/values-zh-rHK/strings.xml +++ b/src/main/res/values-zh-rHK/strings.xml @@ -214,8 +214,6 @@ 英里/小時 分鐘/公里 分鐘/英里 - 根據精度調整 - 根據電池壽命調整 %1$d 英尺 %1$d 英尺 (GPS 訊號佳) %1$d 英尺 (建議值) diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 6a8af800c..b65e89f29 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -214,8 +214,6 @@ 英里/小時 分鐘/公里 分鐘/英里 - 根據精度調整 - 根據電池壽命調整 %1$d 英尺 %1$d 英尺 (GPS 訊號佳) %1$d 英尺 (建議值) diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index e287c5f4a..e8d195d9e 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -281,8 +281,6 @@ limitations under the License. 分钟/公里 分钟/英里 - 适应精度 - 视电池电量而定 %1$d 英尺 %1$d 英尺（GPS 信号极佳） %1$d 英尺（推荐） diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index a4e87c5d7..b5fa76834 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -125,13 +125,9 @@ 5000 - minRecordingInterval + minRecordingIntervalV2 0 - -1 - -2 - @string/min_recording_interval_adapt_battery_life - @string/min_recording_interval_adapt_accuracy @string/min_recording_interval_default 2 3 diff --git a/src/main/res/values/settings_deprecated.xml b/src/main/res/values/settings_deprecated.xml index e0eaa2327..2906d2113 100644 --- a/src/main/res/values/settings_deprecated.xml +++ b/src/main/res/values/settings_deprecated.xml @@ -61,4 +61,6 @@ + + minRecordingInterval \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ad0ea7333..562f573b2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -455,8 +455,6 @@ limitations under the License. %1$s° %1$s, %2$s - Adapt for accuracy - Adapt for battery life %1$d ft %1$d ft (excellent GPS)