diff --git a/src/main/java/de/dennisguse/opentracks/sensors/GpsHandler.java b/src/main/java/de/dennisguse/opentracks/sensors/GpsHandler.java index ff2527720..5948a4ed8 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/GpsHandler.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/GpsHandler.java @@ -110,7 +110,7 @@ public class GpsHandler extends SensorHandler { @Override protected int getSensorPreferenceKey() { - return R.string.settings_sensor_bluetooth_gps_key; + return R.string.settings_sensor_gps_key; } @Override diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeGpsPreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeGpsPreference.java deleted file mode 100644 index 56dc14f8d..000000000 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeGpsPreference.java +++ /dev/null @@ -1,41 +0,0 @@ -package de.dennisguse.opentracks.settings.bluetooth; - -import android.content.Context; -import android.location.LocationManager; -import android.util.AttributeSet; - -import androidx.core.location.LocationManagerCompat; -import androidx.preference.PreferenceDialogFragmentCompat; - -import java.util.List; - -import de.dennisguse.opentracks.sensors.driver.GpsInternal; - -public class BluetoothLeGpsPreference extends BluetoothLeSensorPreference { - - public BluetoothLeGpsPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - public BluetoothLeGpsPreference(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public BluetoothLeGpsPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public BluetoothLeGpsPreference(Context context) { - super(context); - } - - @Override - public PreferenceDialogFragmentCompat createInstance() { - boolean hasInternalSensor = LocationManagerCompat.hasProvider((LocationManager) getContext().getSystemService(Context.LOCATION_SERVICE), GpsInternal.LOCATION_PROVIDER); - - return BluetoothLeSensorPreferenceDialog - .newInstance(getKey(), List.of(), hasInternalSensor); - } - - -} \ No newline at end of file diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index 769c78495..09945e5b0 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -26,9 +26,17 @@ bluetoothCyclingPowerSensor bluetoothRunningSpeedAndCadenceSensor bluetoothPressureSensor - bluetoothGPSSensor + bluetoothGPSSensor NONE INTERNAL + + @string/sensor_type_value_none + @string/sensor_type_value_internal + + + @string/value_none + @string/value_internal_sensor + bluetoothCyclingSpeedWheelCircumference 2135 diff --git a/src/main/res/xml/settings_sensors.xml b/src/main/res/xml/settings_sensors.xml index ac18e1879..25b9179b1 100644 --- a/src/main/res/xml/settings_sensors.xml +++ b/src/main/res/xml/settings_sensors.xml @@ -5,10 +5,13 @@ android:title="@string/settings_sensors_title"> - + android:entryValues="@array/sensor_type_no_bluetooth_entryValues" + android:entries="@array/sensor_type_no_bluetooth_entries" + android:key="@string/settings_sensor_gps_key" + android:title="@string/settings_gps_sensor" + app:useSimpleSummaryProvider="true" />