Release v3.2.1

Note: This breaks RecordingsSettingsActivity.

build.gradle

@@ -83,6 +83,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
 
     androidTestImplementation 'androidx.test:core:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

fastlane/metadata/android/de-DE/full_description.txt

@@ -0,0 +1,9 @@
+Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.
+Erfasst deine Kilometer, ohne dass es jemand anderes tut.
+
+Funktionen & Features:
+* zeichnet Sport und andere Outdooraktivitäten auf
+* unterstützt das Markieren interessanter Orte, inkl. Foto-Funktion
+* zeichnet deine Herzfrequenz auf (unterstützt Bluetooth-LE-Sensoren)
+* exportiert deine Daten als KML oder GPX
+* funktioniert ganz ohne Internet

fastlane/metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Open Tracks – ein GPS-Tracker, der deine Daten für sich behält.

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

@@ -1,4 +1,4 @@
-v3.2: OpenTracks
+v3.2.0: OpenTracks
 
 Changes:
 - Removed Widget

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

@@ -0,0 +1,7 @@
+v3.2.1: OpenTracks
+
+Changes:
+- Settings are now on a single page
+
+Developer:
+- Settings moved to Androidx compat (uses fragments)

fastlane/metadata/android/en-US/full_description.txt

@@ -3,6 +3,6 @@ OpenTracks is a sport tracking application that completely respects your privacy
 Features:
 * Sport tracking: track your sport and outdoor activities
 * Photos and markers: mark interesting locations while tracking
-* Heart rate: supports bluetooth LE sensors
-* Export data: Export tracks either as KML or GPX
+* Heart rate: supports Bluetooth LE sensors
+* Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+OpenTracks

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

@@ -149,8 +149,7 @@ public class StringUtilsTest {
     }
 
     /**
-     * Tests {@link StringUtils#getTime(String)} with fractional seconds and time
-     * zone.
+     * Tests {@link StringUtils#getTime(String)} with fractional seconds and time zone.
      */
     @Test
     public void testGetTime_fractionalAndTimezone() {
@@ -183,7 +182,7 @@ public class StringUtilsTest {
      * Tests {@link StringUtils#getTimeParts(long)} with a positive number.
      */
     @Test
-    public void testGetTimeParts_postive() {
+    public void testGetTimeParts_positive() {
         int[] parts = StringUtils.getTimeParts(61000);
         Assert.assertEquals(1, parts[0]);
         Assert.assertEquals(1, parts[1]);

src/main/AndroidManifest.xml

@@ -16,8 +16,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.dennisguse.opentracks"
     android:installLocation="auto"
-    android:versionCode="3054"
-    android:versionName="v3.2.0"> <!-- For FDroid. -->
+    android:versionCode="3063"
+    android:versionName="v3.2.1"> <!-- For FDroid. -->
     <!-- Permission to initialize services -->
     <application
         android:name=".Startup"
@@ -97,12 +97,8 @@ limitations under the License.
             android:name=".io.file.exporter.ExportActivity"
             android:theme="@style/ThemeCustomTransparent" />
 
-        <activity android:name=".settings.RecordingSettingsActivity" />
-
         <activity android:name=".settings.SettingsActivity" />
 
-        <activity android:name=".settings.StatsSettingsActivity" />
-
         <!-- Services -->
         <provider
             android:name=".content.ShareContentProvider"
@@ -128,7 +124,6 @@ limitations under the License.
         </receiver>
 
         <!-- Providers -->
-
         <service
             android:name=".services.TrackRecordingService"
             android:enabled="true"

src/main/java/de/dennisguse/opentracks/AbstractListActivity.java

@@ -182,8 +182,7 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
      * @param trackIds the track ids
      */
     protected void deleteTracks(long[] trackIds) {
-        ConfirmDeleteDialogFragment.newInstance(trackIds)
-                .show(getSupportFragmentManager(), ConfirmDeleteDialogFragment.CONFIRM_DELETE_DIALOG_TAG);
+        ConfirmDeleteDialogFragment.showDialog(getSupportFragmentManager(), trackIds);
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/ChartView.java

@@ -223,8 +223,8 @@ public class ChartView extends View {
     }
 
     /**
-     * Sets chart by distance. It is expected that after changing this value, data
-     * will be reloaded.
+     * Sets chart by distance.
+     * It is expected that after changing this value, data will be reloaded.
      *
      * @param value true for by distance, false for by time
      */

src/main/java/de/dennisguse/opentracks/MarkerListActivity.java

@@ -300,8 +300,7 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
                 if (markerIds.length > 1 && markerIds.length == listView.getCount()) {
                     markerIds = new long[]{-1L};
                 }
-                DeleteMarkerDialogFragment.newInstance(markerIds)
-                        .show(getSupportFragmentManager(), DeleteMarkerDialogFragment.DELETE_MARKER_DIALOG_TAG);
+                DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), markerIds);
                 return true;
             case R.id.list_context_menu_select_all:
                 int size = listView.getCount();

src/main/java/de/dennisguse/opentracks/SearchListActivity.java

@@ -109,7 +109,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
     private ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
         @Override
         public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
-            boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+            boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
             boolean isSingleSelection = positions.length == 1;
             boolean isSingleSelectionTrack;
             if (isSingleSelection) {
@@ -323,7 +323,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
                 return true;
             case R.id.list_context_menu_delete:
                 if (markerId != null) {
-                    DeleteMarkerDialogFragment.newInstance(new long[]{markerId}).show(getSupportFragmentManager(), DeleteMarkerDialogFragment.DELETE_MARKER_DIALOG_TAG);
+                    DeleteMarkerDialogFragment.showDialog(getSupportFragmentManager(), new long[]{markerId});
                 } else {
                     deleteTracks(new long[]{trackId});
                 }

src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java

@@ -48,7 +48,6 @@ import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 import de.dennisguse.opentracks.content.WaypointCreationRequest;
 import de.dennisguse.opentracks.fragments.ChartFragment;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
 import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
 import de.dennisguse.opentracks.fragments.FrequencyDialogFragment;
 import de.dennisguse.opentracks.fragments.StatsFragment;
@@ -66,7 +65,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class TrackDetailActivity extends AbstractListActivity implements ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class TrackDetailActivity extends AbstractListActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
 
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_MARKER_ID = "marker_id";
@@ -361,12 +360,10 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                 startActivity(intent);
                 return true;
             case R.id.track_detail_voice_frequency:
-                FrequencyDialogFragment.newInstance(R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT, R.string.menu_voice_frequency)
-                        .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
+                FrequencyDialogFragment.showDialog(getSupportFragmentManager(), R.string.voice_frequency_key, PreferencesUtils.VOICE_FREQUENCY_DEFAULT, R.string.menu_voice_frequency);
                 return true;
             case R.id.track_detail_split_frequency:
-                FrequencyDialogFragment.newInstance(R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.menu_split_frequency)
-                        .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
+                FrequencyDialogFragment.showDialog(getSupportFragmentManager(), R.string.split_frequency_key, PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.menu_split_frequency);
                 return true;
             case R.id.track_detail_edit:
                 intent = IntentUtils.newIntent(this, TrackEditActivity.class)
@@ -487,7 +484,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
     }
 
     public void chooseActivityType(String category) {
-        ChooseActivityTypeDialogFragment.newInstance(category).show(getSupportFragmentManager(), ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
+        ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), category);
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/TrackEditActivity.java

@@ -28,10 +28,11 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 
+import androidx.annotation.NonNull;
+
 import de.dennisguse.opentracks.content.ContentProviderUtils;
 import de.dennisguse.opentracks.content.Track;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
 import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 import de.dennisguse.opentracks.util.TrackUtils;
@@ -41,7 +42,7 @@ import de.dennisguse.opentracks.util.TrackUtils;
  *
  * @author Leif Hendrik Wilden
  */
-public class TrackEditActivity extends AbstractActivity implements ChooseActivityTypeCaller {
+public class TrackEditActivity extends AbstractActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
 
     public static final String EXTRA_TRACK_ID = "track_id";
     public static final String EXTRA_NEW_TRACK = "new_track";
@@ -119,9 +120,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (event.getAction() == MotionEvent.ACTION_UP) {
-                    ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show(
-                            getSupportFragmentManager(),
-                            ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
+                    ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
                 }
                 return true;
             }
@@ -130,9 +129,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    ChooseActivityTypeDialogFragment.newInstance(activityType.getText().toString()).show(
-                            getSupportFragmentManager(),
-                            ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
+                    ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), activityType.getText().toString());
                 }
                 return true;
             }
@@ -182,7 +179,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(ICON_VALUE_KEY, iconValue);
     }

src/main/java/de/dennisguse/opentracks/TrackListActivity.java

@@ -148,7 +148,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                     PreferencesUtils.getKey(TrackListActivity.this, R.string.recording_track_id_key))) {
                 recordingTrackId = PreferencesUtils.getLong(
                         TrackListActivity.this, R.string.recording_track_id_key);
-                if (key != null && recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
+                if (key != null && PreferencesUtils.isRecording(recordingTrackId)) {
                     trackRecordingServiceConnection.startAndBind();
                 }
             }
@@ -164,7 +164,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
                     public void run() {
                         TrackListActivity.this.invalidateOptionsMenu();
                         LoaderManager.getInstance(TrackListActivity.this).restartLoader(0, null, loaderCallbacks);
-                        boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+                        boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
                         trackController.update(isRecording, recordingTrackPaused);
                     }
                 });
@@ -200,7 +200,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    trackController.update(recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT, recordingTrackPaused);
+                    trackController.update(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
                 }
             });
 
@@ -339,8 +339,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
         // Update UI
         this.invalidateOptionsMenu();
         LoaderManager.getInstance(this).restartLoader(0, null, loaderCallbacks);
-        boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-        trackController.onResume(isRecording, recordingTrackPaused);
+        trackController.onResume(PreferencesUtils.isRecording(recordingTrackId), recordingTrackPaused);
     }
 
     @Override
@@ -392,7 +391,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         boolean isGpsStarted = TrackRecordingServiceConnection.isRecordingServiceRunning(this);
-        boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+        boolean isRecording = PreferencesUtils.isRecording(recordingTrackId);
         updateMenuItems(isGpsStarted, isRecording);
 
         View searchView = searchMenuItem.getActionView();

src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java

@@ -208,7 +208,7 @@ public class TrackDataHub implements DataSourceListener {
      * Returns true if the selected track is recording.
      */
     public boolean isSelectedTrackRecording() {
-        return selectedTrackId == recordingTrackId && recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+        return selectedTrackId == recordingTrackId && PreferencesUtils.isRecording(recordingTrackId);
     }
 
     /**

src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java

@@ -352,8 +352,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Resumes the trackDataHub. Needs to be synchronized because trackDataHub can
-     * be accessed by multiple threads.
+     * Resumes the trackDataHub.
+     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized void resumeTrackDataHub() {
         trackDataHub = ((TrackDetailActivity) getActivity()).getTrackDataHub();
@@ -363,8 +363,8 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Pauses the trackDataHub. Needs to be synchronized because trackDataHub can
-     * be accessed by multiple threads.
+     * Pauses the trackDataHub.
+     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized void pauseTrackDataHub() {
         trackDataHub.unregisterTrackDataListener(this);
@@ -372,16 +372,16 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Returns true if the selected track is recording. Needs to be synchronized
-     * because trackDataHub can be accessed by multiple threads.
+     * Returns true if the selected track is recording.
+     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized boolean isSelectedTrackRecording() {
         return trackDataHub != null && trackDataHub.isSelectedTrackRecording();
     }
 
     /**
-     * Reloads the trackDataHub. Needs to be synchronized because trackDataHub can
-     * be accessed by multiple threads.
+     * Reloads the trackDataHub.
+     * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
     private synchronized void reloadTrackDataHub() {
         if (trackDataHub != null) {
@@ -389,18 +389,12 @@ public class ChartFragment extends Fragment implements TrackDataListener {
         }
     }
 
-    /**
-     * To zoom in.
-     */
     private void zoomIn() {
         chartView.zoomIn();
         zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
         zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
     }
 
-    /**
-     * To zoom out.
-     */
     private void zoomOut() {
         chartView.zoomOut();
         zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
@@ -438,9 +432,6 @@ public class ChartFragment extends Fragment implements TrackDataListener {
         double elevation = Double.NaN;
         double speed = Double.NaN;
         double pace = Double.NaN;
-        double heartRate = Double.NaN;
-        double cadence = Double.NaN;
-        double power = Double.NaN;
 
         if (tripStatisticsUpdater != null) {
             tripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
@@ -466,6 +457,10 @@ public class ChartFragment extends Fragment implements TrackDataListener {
             }
             pace = speed == 0 ? 0.0 : 60.0 / speed;
         }
+
+        double heartRate = Double.NaN;
+        double cadence = Double.NaN;
+        double power = Double.NaN;
         if (location instanceof SensorDataSetLocation && ((SensorDataSetLocation) location).getSensorDataSet() != null) {
             SensorDataSet sensorDataSet = ((SensorDataSetLocation) location).getSensorDataSet();
             if (sensorDataSet.hasHeartRate()) {
@@ -479,6 +474,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
             }
         }
 
+        //TODO: Is related to ChartView.ELEVATION_SERIES etc.
         if (data != null) {
             data[0] = timeOrDistance;
             data[1] = elevation;

src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java

@@ -1,34 +1,18 @@
-/*
- * Copyright 2013 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.fragments;
 
-import android.app.AlertDialog;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,56 +22,13 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * A DialogFragment to choose an activity type.
- *
- * @author apoorvn
  */
-public class ChooseActivityTypeDialogFragment extends DialogFragment {
+public class ChooseActivityTypeDialogFragment extends DialogFragment implements AdapterView.OnItemClickListener {
 
-    public static final String CHOOSE_ACTIVITY_TYPE_DIALOG_TAG = "chooseActivityType";
-    private static final String KEY_CATEGORY = "category";
-    private ChooseActivityTypeCaller caller;
+    private static final String CHOOSE_ACTIVITY_TYPE_DIALOG_TAG = "chooseActivityType";
 
-    public static ChooseActivityTypeDialogFragment newInstance(String category) {
-        Bundle bundle = new Bundle();
-        bundle.putString(KEY_CATEGORY, category);
-
-        ChooseActivityTypeDialogFragment fragment = new ChooseActivityTypeDialogFragment();
-        fragment.setArguments(bundle);
-        return fragment;
-    }
-
-    public static Dialog getDialog(final Context context, final String category, final ChooseActivityTypeCaller caller) {
-        View view = LayoutInflater.from(context).inflate(R.layout.choose_activity_type, null);
-        GridView gridView = view.findViewById(R.id.choose_activity_type_grid_view);
-
-        List<Integer> imageIds = new ArrayList<>();
-        for (String iconValue : TrackIconUtils.getAllIconValues()) {
-            imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
-        }
-
-        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(imageIds);
-        gridView.setAdapter(imageAdapter);
-
-        final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();
-        alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialog) {
-                int position = getPosition(context, category);
-                if (position != -1) {
-                    imageAdapter.setSelected(position);
-                    imageAdapter.notifyDataSetChanged();
-                }
-            }
-        });
-
-        gridView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                caller.onChooseActivityTypeDone(TrackIconUtils.getAllIconValues().get(position));
-                alertDialog.dismiss();
-            }
-        });
-        return alertDialog;
+    public static void showDialog(FragmentManager fragmentManager, String preselectedCategory) {
+        new ChooseActivityTypeDialogFragment(preselectedCategory).show(fragmentManager, ChooseActivityTypeDialogFragment.CHOOSE_ACTIVITY_TYPE_DIALOG_TAG);
     }
 
     private static int getPosition(Context context, String category) {
@@ -99,32 +40,79 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
         return TrackIconUtils.getAllIconValues().indexOf(iconValue);
     }
 
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        try {
-            caller = (ChooseActivityTypeCaller) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(context + " must implement " + ChooseActivityTypeCaller.class.getSimpleName());
-        }
+    private String preselectedCategory;
+
+    private ChooseActivityTypeCaller chooseActivityTypeCaller;
+
+    private ChooseActivityTypeDialogFragment(String preselectedCategory) {
+        this.preselectedCategory = preselectedCategory;
     }
 
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return getDialog(getActivity(), getArguments().getString(KEY_CATEGORY), caller);
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog.setTitle(R.string.track_edit_activity_type_hint);
+        return dialog;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.choose_activity_type, container);
+        GridView gridView = view.findViewById(R.id.choose_activity_type_grid_view);
+
+        List<Integer> imageIds = new ArrayList<>();
+        for (String iconValue : TrackIconUtils.getAllIconValues()) {
+            imageIds.add(TrackIconUtils.getIconDrawable(iconValue));
+        }
+
+        final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(imageIds);
+        gridView.setAdapter(imageAdapter);
+
+        int position = getPosition(getContext(), preselectedCategory);
+        if (position != -1) {
+            imageAdapter.setSelected(position);
+            imageAdapter.notifyDataSetChanged();
+        }
+
+        gridView.setOnItemClickListener(this);
+        return view;
     }
 
     /**
-     * Interface for caller of this dialog fragment.
-     *
-     * @author apoorvn
+     * TODO: Only used by obsolete Androidx preferences. Remove when onAttach(Context) is called.
+     */
+    @Override
+    public void onAttach(@NonNull Activity activity) {
+        super.onAttach(activity);
+        try {
+            chooseActivityTypeCaller = (ChooseActivityTypeCaller) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity + " must implement " + ChooseActivityTypeCaller.class.getSimpleName());
+        }
+    }
+
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        try {
+            chooseActivityTypeCaller = (ChooseActivityTypeCaller) context;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(context + " must implement " + ChooseActivityTypeCaller.class.getSimpleName());
+        }
+    }
+
+
+    @Override
+    public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
+        chooseActivityTypeCaller.onChooseActivityTypeDone(TrackIconUtils.getAllIconValues().get(position));
+        dismiss();
+    }
+
+    /**
+     * Interface for chooseActivityTypeCaller of this dialog fragment.
      */
     public interface ChooseActivityTypeCaller {
 
-        /**
-         * Called when choose activity type is done.
-         */
         void onChooseActivityTypeDone(String iconValue);
     }
 }

src/main/java/de/dennisguse/opentracks/fragments/ConfirmDeleteDialogFragment.java

@@ -23,6 +23,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.util.DialogUtils;
@@ -34,22 +35,21 @@ import de.dennisguse.opentracks.util.DialogUtils;
  */
 public class ConfirmDeleteDialogFragment extends DialogFragment {
 
-    public static final String CONFIRM_DELETE_DIALOG_TAG = "confirmDeleteDialog";
-    private static final String KEY_TRACK_IDS = "trackIds";
+    private static final String CONFIRM_DELETE_DIALOG_TAG = "confirmDeleteDialog";
     private ConfirmDeleteCaller caller;
+    private long[] trackIds;
+
+    public ConfirmDeleteDialogFragment(long[] trackIds) {
+        this.trackIds = trackIds;
+    }
 
     /**
      * Create a new instance.
      *
      * @param trackIds list of track ids to delete. To delete all, set to size 1 with trackIds[0] == -1L
      */
-    public static ConfirmDeleteDialogFragment newInstance(long[] trackIds) {
-        Bundle bundle = new Bundle();
-        bundle.putLongArray(KEY_TRACK_IDS, trackIds);
-
-        ConfirmDeleteDialogFragment deleteTrackDialogFragment = new ConfirmDeleteDialogFragment();
-        deleteTrackDialogFragment.setArguments(bundle);
-        return deleteTrackDialogFragment;
+    public static void showDialog(FragmentManager fragmentManager, long[] trackIds) {
+        new ConfirmDeleteDialogFragment(trackIds).show(fragmentManager, CONFIRM_DELETE_DIALOG_TAG);
     }
 
     @Override
@@ -62,11 +62,9 @@ public class ConfirmDeleteDialogFragment extends DialogFragment {
         }
     }
 
-
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final long[] trackIds = getArguments().getLongArray(KEY_TRACK_IDS);
         int titleId;
         int messageId;
         titleId = trackIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.track_delete_one_confirm_title;

src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java

@@ -24,6 +24,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.ContentProviderUtils;
@@ -37,17 +38,17 @@ import de.dennisguse.opentracks.util.DialogUtils;
  */
 public class DeleteMarkerDialogFragment extends DialogFragment {
 
-    public static final String DELETE_MARKER_DIALOG_TAG = "deleteMarkerDialog";
-    private static final String KEY_MARKER_IDS = "markerIds";
+    private static final String DELETE_MARKER_DIALOG_TAG = "deleteMarkerDialog";
+    private long[] markerIds;
+
     private DeleteMarkerCaller caller;
 
-    public static DeleteMarkerDialogFragment newInstance(long[] markerIds) {
-        Bundle bundle = new Bundle();
-        bundle.putLongArray(KEY_MARKER_IDS, markerIds);
+    public DeleteMarkerDialogFragment(long[] markerIds) {
+        this.markerIds = markerIds;
+    }
 
-        DeleteMarkerDialogFragment deleteMarkerDialogFragment = new DeleteMarkerDialogFragment();
-        deleteMarkerDialogFragment.setArguments(bundle);
-        return deleteMarkerDialogFragment;
+    public static void showDialog(FragmentManager fragmentManager, long[] markerIds) {
+        new DeleteMarkerDialogFragment(markerIds).show(fragmentManager, DELETE_MARKER_DIALOG_TAG);
     }
 
     @Override
@@ -64,7 +65,6 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final FragmentActivity fragmentActivity = getActivity();
-        final long[] markerIds = getArguments().getLongArray(KEY_MARKER_IDS);
         int titleId;
         int messageId;
         if (markerIds.length == 1 && markerIds[0] == -1L) {
@@ -81,8 +81,7 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
                         new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(
-                                        fragmentActivity);
+                                ContentProviderUtils contentProviderUtils = ContentProviderUtils.Factory.get(fragmentActivity);
                                 for (long markerId : markerIds) {
                                     contentProviderUtils.deleteWaypoint(fragmentActivity,
                                             markerId, new DescriptionGeneratorImpl(fragmentActivity));

src/main/java/de/dennisguse/opentracks/fragments/FileTypeDialogFragment.java

@@ -25,6 +25,7 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import java.util.Locale;
 
@@ -39,19 +40,19 @@ import de.dennisguse.opentracks.util.FileUtils;
  */
 public class FileTypeDialogFragment extends DialogFragment {
 
-    public static final String FILE_TYPE_DIALOG_TAG = "fileType";
-    private static final String KEY_TITLE_ID = "titleId";
-    private static final String KEY_OPTION_ID = "optionId";
+    private static final String FILE_TYPE_DIALOG_TAG = "fileType";
+    private int titleId;
+
     private FileTypeCaller caller;
+    private int optionId;
 
-    public static FileTypeDialogFragment newInstance(int titleId, int optionId) {
-        Bundle bundle = new Bundle();
-        bundle.putInt(KEY_TITLE_ID, titleId);
-        bundle.putInt(KEY_OPTION_ID, optionId);
+    public FileTypeDialogFragment(int titleId, int optionId) {
+        this.titleId = titleId;
+        this.optionId = optionId;
+    }
 
-        FileTypeDialogFragment fileTypeDialogFragment = new FileTypeDialogFragment();
-        fileTypeDialogFragment.setArguments(bundle);
-        return fileTypeDialogFragment;
+    public static void showDialog(FragmentManager fragmentManager, int titleId, int optionId) {
+        new FileTypeDialogFragment(titleId, optionId).show(fragmentManager, FILE_TYPE_DIALOG_TAG);
     }
 
     @Override
@@ -67,8 +68,6 @@ public class FileTypeDialogFragment extends DialogFragment {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        int optionId = getArguments().getInt(KEY_OPTION_ID);
-        final int titleId = getArguments().getInt(KEY_TITLE_ID);
         final TrackFileFormat[] trackFileFormats = {TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA_AND_PICTURES, TrackFileFormat.KML_WITH_TRACKDETAIL_AND_SENSORDATA, TrackFileFormat.GPX};
         String[] choices = new String[trackFileFormats.length];
         for (int i = 0; i < choices.length; i++) {
@@ -96,7 +95,7 @@ public class FileTypeDialogFragment extends DialogFragment {
     }
 
     @Override
-    public void onCancel(DialogInterface dialog) {
+    public void onCancel(@NonNull DialogInterface dialog) {
         onDismissed();
     }
 

src/main/java/de/dennisguse/opentracks/fragments/FrequencyDialogFragment.java

@@ -24,6 +24,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -36,21 +37,19 @@ import de.dennisguse.opentracks.util.StringUtils;
  */
 public class FrequencyDialogFragment extends DialogFragment {
 
-    public static final String FREQUENCY_DIALOG_TAG = "frequencyDialog";
+    private static final String FREQUENCY_DIALOG_TAG = "frequencyDialog";
+    private int preferenceId;
+    private int defaultValue;
+    private int titleId;
 
-    private static final String KEY_PREFERENCE_ID = "preferenceId";
-    private static final String KEY_DEFAULT_VALUE = "defaultValue";
-    private static final String KEY_TITLE_ID = "titleId";
+    public FrequencyDialogFragment(int preferenceId, int defaultValue, int titleId) {
+        this.preferenceId = preferenceId;
+        this.defaultValue = defaultValue;
+        this.titleId = titleId;
+    }
 
-    public static FrequencyDialogFragment newInstance(int preferenceId, int defaultValue, int titleId) {
-        Bundle bundle = new Bundle();
-        bundle.putInt(KEY_PREFERENCE_ID, preferenceId);
-        bundle.putInt(KEY_DEFAULT_VALUE, defaultValue);
-        bundle.putInt(KEY_TITLE_ID, titleId);
-
-        FrequencyDialogFragment frequencyDialogFragment = new FrequencyDialogFragment();
-        frequencyDialogFragment.setArguments(bundle);
-        return frequencyDialogFragment;
+    public static void showDialog(FragmentManager fragmentManager, int preferenceId, int defaultValue, int titleId) {
+        new FrequencyDialogFragment(preferenceId, defaultValue, titleId).show(fragmentManager, FREQUENCY_DIALOG_TAG);
     }
 
     @Override
@@ -58,9 +57,6 @@ public class FrequencyDialogFragment extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         FragmentActivity fragmentActivity = getActivity();
 
-        final int preferenceId = getArguments().getInt(KEY_PREFERENCE_ID);
-        int defaultValue = getArguments().getInt(KEY_DEFAULT_VALUE);
-        int titleId = getArguments().getInt(KEY_TITLE_ID);
         int frequencyValue = PreferencesUtils.getInt(fragmentActivity, preferenceId, defaultValue);
 
         return new AlertDialog.Builder(fragmentActivity).setPositiveButton(

src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java

@@ -192,8 +192,7 @@ public class MarkerDetailFragment extends Fragment {
                 startActivity(intent);
                 return true;
             case R.id.marker_detail_delete:
-                DeleteMarkerDialogFragment.newInstance(new long[]{markerId})
-                        .show(getChildFragmentManager(), DeleteMarkerDialogFragment.DELETE_MARKER_DIALOG_TAG);
+                DeleteMarkerDialogFragment.showDialog(getChildFragmentManager(), new long[]{markerId});
                 return true;
             default:
                 return super.onOptionsItemSelected(item);

src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java

@@ -84,9 +84,7 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
     }
 
     private void fileTypeDialogStart() {
-        FileTypeDialogFragment
-                .newInstance(R.string.export_all_title, R.string.export_all_option)
-                .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
+        FileTypeDialogFragment.showDialog(getSupportFragmentManager(), R.string.export_all_title, R.string.export_all_option);
     }
 
     @Override

src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportAsyncTask.java

@@ -99,7 +99,7 @@ public class ExportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
     protected Boolean doInBackground(Void... params) {
         try {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
-            boolean isRecording = PreferencesUtils.getLong(exportActivity, R.string.recording_track_id_key) != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+            boolean isRecording = PreferencesUtils.isRecording(exportActivity);
             boolean isPaused = PreferencesUtils.getBoolean(exportActivity, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
             // Get the wake lock if not recording or paused
             if (!isRecording || isPaused) {

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

@@ -85,9 +85,7 @@ public class ImportActivity extends FragmentActivity implements FileTypeDialogFr
     }
 
     private void fileTypeDialogStart() {
-        FileTypeDialogFragment
-                .newInstance(R.string.import_selection_title, R.string.import_selection_option)
-                .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
+        FileTypeDialogFragment.showDialog(getSupportFragmentManager(), R.string.import_selection_title, R.string.import_selection_option);
     }
 
     @Override

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

@@ -103,7 +103,7 @@ public class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
         try {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
             // Get the wake lock if not recording or paused
-            boolean isRecording = PreferencesUtils.getLong(importActivity, R.string.recording_track_id_key) != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+            boolean isRecording = PreferencesUtils.isRecording(importActivity);
             boolean isPaused = PreferencesUtils.getBoolean(importActivity, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
             if (!isRecording || isPaused) {
                 wakeLock = SystemUtils.acquireWakeLock(importActivity, wakeLock);

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

@@ -119,10 +119,9 @@ public class TrackRecordingService extends Service {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
             if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_id_key))) {
-                long trackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
                 // Only through the TrackRecordingService can one stop a recording and set the recordingTrackId to -1L.
-                if (trackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
-                    recordingTrackId = trackId;
+                if (PreferencesUtils.isRecording(context)) {
+                    recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
                 }
             }
             if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.recording_track_paused_key))) {
@@ -310,7 +309,7 @@ public class TrackRecordingService extends Service {
      * Returns true if the service is recording.
      */
     public boolean isRecording() {
-        return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+        return PreferencesUtils.isRecording(recordingTrackId);
     }
 
     /**

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

@@ -226,37 +226,14 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
         }
     }
 
-    /**
-     * Stops the recording.
-     *
-     * @param context    the context
-     * @param showEditor true to show the editor
-     */
-    public void stopRecording(@NonNull Context context, boolean showEditor) {
-        ITrackRecordingService trackRecordingService = getServiceIfBound();
-        if (trackRecordingService == null) {
-            resetRecordingState(context);
-        } else {
-            try {
-                if (showEditor) {
-                    // Need to remember the recordingTrackId before calling endCurrentTrack() as endCurrentTrack() sets the value to -1L.
-                    long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
-                    trackRecordingService.endCurrentTrack();
-                    if (recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
-                        Intent intent = IntentUtils.newIntent(context, TrackEditActivity.class)
-                                .putExtra(TrackEditActivity.EXTRA_TRACK_ID, recordingTrackId)
-                                .putExtra(TrackEditActivity.EXTRA_NEW_TRACK, true);
-                        context.startActivity(intent);
-                    }
-                } else {
-                    trackRecordingService.endCurrentTrack();
-                }
-            } catch (Exception e) {
-                //TODO What exception are we catching here? Should be removed...
-                Log.e(TAG, "Unable to stop recording.", e);
-            }
+    private static void resetRecordingState(Context context) {
+        if (PreferencesUtils.isRecording(context)) {
+            PreferencesUtils.setLong(context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
+        }
+        boolean recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+        if (!recordingTrackPaused) {
+            PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
         }
-        unbindAndStop();
     }
 
     /**
@@ -284,14 +261,36 @@ public class TrackRecordingServiceConnection implements ServiceConnection, Death
         return -1L;
     }
 
-    private static void resetRecordingState(Context context) {
-        long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
-        if (recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) {
-            PreferencesUtils.setLong(context, R.string.recording_track_id_key, PreferencesUtils.RECORDING_TRACK_ID_DEFAULT);
-        }
-        boolean recordingTrackPaused = PreferencesUtils.getBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
-        if (!recordingTrackPaused) {
-            PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
+    /**
+     * Stops the recording.
+     *
+     * @param context    the context
+     * @param showEditor true to show the editor
+     */
+    public void stopRecording(@NonNull Context context, boolean showEditor) {
+        ITrackRecordingService trackRecordingService = getServiceIfBound();
+        if (trackRecordingService == null) {
+            resetRecordingState(context);
+        } else {
+            try {
+                if (showEditor) {
+                    // Need to remember the recordingTrackId before calling endCurrentTrack() as endCurrentTrack() sets the value to -1L.
+                    long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+                    trackRecordingService.endCurrentTrack();
+                    if (PreferencesUtils.isRecording(context)) {
+                        Intent intent = IntentUtils.newIntent(context, TrackEditActivity.class)
+                                .putExtra(TrackEditActivity.EXTRA_TRACK_ID, recordingTrackId)
+                                .putExtra(TrackEditActivity.EXTRA_NEW_TRACK, true);
+                        context.startActivity(intent);
+                    }
+                } else {
+                    trackRecordingService.endCurrentTrack();
+                }
+            } catch (Exception e) {
+                //TODO What exception are we catching here? Should be removed...
+                Log.e(TAG, "Unable to stop recording.", e);
+            }
         }
+        unbindAndStop();
     }
 }

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

@@ -17,8 +17,7 @@
 package de.dennisguse.opentracks.settings;
 
 import android.content.Context;
-import android.os.Parcelable;
-import android.preference.DialogPreference;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -28,7 +27,12 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Spinner;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceDialogFragment;
+
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 import de.dennisguse.opentracks.util.TrackIconUtils;
 
@@ -39,106 +43,122 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
  */
 public class ActivityTypePreference extends DialogPreference {
 
-    private RecordingSettingsActivity recordingSettingsActivity;
-    private AutoCompleteTextView textView;
-    private Spinner spinner;
+    private SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
+        @Override
+        public CharSequence provideSummary(DialogPreference preference) {
+            String defaultActivity = PreferencesUtils.getString(ActivityTypePreference.this.getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+            return defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getContext().getString(R.string.value_unknown);
+        }
+    };
 
     public ActivityTypePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setDialogLayoutResource(R.layout.activity_type_preference);
+        setDialogLayoutResource(R.layout.preference_activity_type);
         setPositiveButtonText(android.R.string.ok);
         setNegativeButtonText(android.R.string.cancel);
         setDialogIcon(null);
-        setPersistent(false);
+        setPersistent(true);
+        //TODO: for some reason the summary is not updated; after changing it. Enable summaryprovider, when fixed.
+//        setSummaryProvider(summaryProvider);
     }
 
     @Override
-    protected View onCreateDialogView() {
-        View view = super.onCreateDialogView();
-        textView = view.findViewById(R.id.activity_type_preference_text_view);
-        spinner = view.findViewById(R.id.activity_type_preference_spinner);
+    public int getDialogLayoutResource() {
+        return R.layout.preference_activity_type;
+    }
 
-        String category = PreferencesUtils.getString(
-                getContext(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
-        textView.setText(category);
+    public static class ActivityPreferenceDialog extends PreferenceDialogFragment {
 
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getContext(), R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
-        textView.setAdapter(adapter);
-        textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                String iconValue = TrackIconUtils.getIconValue(getContext(), (String) textView.getAdapter().getItem(position));
-                TrackIconUtils.setIconSpinner(spinner, iconValue);
-            }
-        });
-        textView.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (!hasFocus) {
-                    String iconValue = TrackIconUtils.getIconValue(getContext(), textView.getText().toString());
+        private AutoCompleteTextView textView;
+        private Spinner spinner;
+
+        static ActivityPreferenceDialog newInstance(String preferenceKey) {
+            ActivityTypePreference.ActivityPreferenceDialog dialog = new ActivityTypePreference.ActivityPreferenceDialog();
+            final Bundle bundle = new Bundle(1);
+            bundle.putString(PreferenceDialogFragment.ARG_KEY, preferenceKey);
+            dialog.setArguments(bundle);
+
+            return dialog;
+        }
+
+        @Override
+        protected void onBindDialogView(View view) {
+            super.onBindDialogView(view);
+
+            final Context context = getActivity();
+
+            textView = view.findViewById(R.id.activity_type_preference_text_view);
+            String category = PreferencesUtils.getString(context, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+            textView.setText(category);
+            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context, R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
+            textView.setAdapter(adapter);
+            textView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+                    String iconValue = TrackIconUtils.getIconValue(context, (String) textView.getAdapter().getItem(position));
                     TrackIconUtils.setIconSpinner(spinner, iconValue);
                 }
-            }
-        });
-
-        String iconValue = TrackIconUtils.getIconValue(getContext(), category);
-        spinner.setAdapter(TrackIconUtils.getIconSpinnerAdapter(getContext(), iconValue));
-        spinner.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    recordingSettingsActivity.showChooseActivityTypeDialog();
+            });
+            textView.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    if (!hasFocus) {
+                        String iconValue = TrackIconUtils.getIconValue(context, textView.getText().toString());
+                        TrackIconUtils.setIconSpinner(spinner, iconValue);
+                    }
                 }
-                return true;
-            }
-        });
-        spinner.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-                    recordingSettingsActivity.showChooseActivityTypeDialog();
-                }
-                return true;
-            }
-        });
-        return view;
-    }
+            });
 
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        if (positiveResult) {
-            String value = textView.getText().toString();
-            if (callChangeListener(value)) {
-                PreferencesUtils.setString(getContext(), R.string.default_activity_key, value);
+            String iconValue = TrackIconUtils.getIconValue(context, category);
+            spinner = view.findViewById(R.id.activity_type_preference_spinner);
+            spinner.setAdapter(TrackIconUtils.getIconSpinnerAdapter(context, iconValue));
+            spinner.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == MotionEvent.ACTION_UP) {
+                        showIconSelectDialog();
+                    }
+                    return true;
+                }
+            });
+            spinner.setOnKeyListener(new View.OnKeyListener() {
+                @Override
+                public boolean onKey(View v, int keyCode, KeyEvent event) {
+                    if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+                        showIconSelectDialog();
+                    }
+                    return true;
+                }
+            });
+        }
+
+        private void showIconSelectDialog() {
+            String category = PreferencesUtils.getString(getActivity(), R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+
+            // TODO Remove casting when upgrading to new Androidx compat.
+            FragmentActivity fragmentActivity = (androidx.fragment.app.FragmentActivity) getActivity();
+            ChooseActivityTypeDialogFragment.showDialog(fragmentActivity.getSupportFragmentManager(), category);
+        }
+
+        @Override
+        public void onDialogClosed(boolean positiveResult) {
+            if (positiveResult) {
+                String newDefaultActivity = textView.getText().toString();
+                if (getPreference().callChangeListener(newDefaultActivity)) {
+                    PreferencesUtils.setString(getActivity(), R.string.default_activity_key, newDefaultActivity);
+                }
             }
         }
-    }
 
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        super.onRestoreInstanceState(state);
-        String iconValue = TrackIconUtils.getIconValue(getContext(), textView.getText().toString());
-        TrackIconUtils.setIconSpinner(spinner, iconValue);
-        textView.clearFocus();
-    }
-
-    /**
-     * Sets the recording settings activity.
-     *
-     * @param activity the activity
-     */
-    void setRecordingSettingsActivity(RecordingSettingsActivity activity) {
-        recordingSettingsActivity = activity;
-    }
-
-    /**
-     * Updates the value of the dialog.
-     *
-     * @param iconValue the icon value
-     */
-    void updateValue(String iconValue) {
-        TrackIconUtils.setIconSpinner(spinner, iconValue);
-        textView.setText(recordingSettingsActivity.getString(TrackIconUtils.getIconActivityType(iconValue)));
-        textView.clearFocus();
+        /**
+         * Updates the value of the dialog.
+         *
+         * @param iconValue the icon value
+         */
+        public void updateUI(String iconValue) {
+            TrackIconUtils.setIconSpinner(spinner, iconValue);
+            textView.setText(getActivity().getString(TrackIconUtils.getIconActivityType(iconValue)));
+            textView.clearFocus();
+        }
     }
 }

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

@@ -0,0 +1,213 @@
+package de.dennisguse.opentracks.settings;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+
+import androidx.preference.ListPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.util.BluetoothDeviceUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+
+final class PreferenceHelper {
+
+    /**
+     * Sets the min recording interval options.
+     *
+     * @param options the options
+     * @param values  the values
+     */
+    static void setMinRecordingIntervalOptions(Context context, String[] options, String[] values) {
+        for (int i = 0; i < values.length; i++) {
+            int value = Integer.parseInt(values[i]);
+            switch (value) {
+                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE:
+                    options[i] = context.getString(R.string.value_adapt_battery_life);
+                    break;
+                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_ACCURACY:
+                    options[i] = context.getString(R.string.value_adapt_accuracy);
+                    break;
+                case PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT:
+                    options[i] = context.getString(R.string.value_smallest_recommended);
+                    break;
+                default:
+                    options[i] = value < 60 ? context.getString(R.string.value_integer_second, value) : context.getString(R.string.value_integer_minute, value / 60);
+            }
+        }
+    }
+
+    /**
+     * Sets the recording distance interval options.
+     *
+     * @param options     the options
+     * @param values      the values
+     * @param metricUnits true for metric units
+     */
+    static void setRecordingDistanceIntervalOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+        for (int i = 0; i < values.length; i++) {
+            int value = Integer.parseInt(values[i]);
+            String displayValue;
+            if (metricUnits) {
+                displayValue = context.getString(R.string.value_integer_meter, value);
+                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
+                    options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                } else {
+                    options[i] = displayValue;
+                }
+            } else {
+                int feet = (int) (value * UnitConversions.M_TO_FT);
+                displayValue = context.getString(R.string.value_integer_feet, feet);
+                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
+                    options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                } else {
+                    options[i] = displayValue;
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the max recording distance options.
+     *
+     * @param options     the options
+     * @param values      the values
+     * @param metricUnits true for metric units
+     */
+    static void setMaxRecordingDistanceOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+        for (int i = 0; i < values.length; i++) {
+            int value = Integer.parseInt(values[i]);
+            String displayValue;
+            if (metricUnits) {
+                displayValue = context.getString(R.string.value_integer_meter, value);
+                if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
+                    options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                } else {
+                    options[i] = displayValue;
+                }
+            } else {
+                int feet = (int) (value * UnitConversions.M_TO_FT);
+                if (feet < 2000) {
+                    displayValue = context.getString(R.string.value_integer_feet, feet);
+                    if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
+                        options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                    } else {
+                        options[i] = displayValue;
+                    }
+                } else {
+                    double mile = feet * UnitConversions.FT_TO_MI;
+                    displayValue = context.getString(R.string.value_float_mile, mile);
+                    options[i] = displayValue;
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the recording gps accuracy options.
+     *
+     * @param options     the options
+     * @param values      the values
+     * @param metricUnits true for metric units
+     */
+    static void setRecordingGpsAccuracyOptions(Context context, String[] options, String[] values, boolean metricUnits) {
+        for (int i = 0; i < values.length; i++) {
+            int value = Integer.parseInt(values[i]);
+            String displayValue;
+            if (metricUnits) {
+                displayValue = context.getString(R.string.value_integer_meter, value);
+                switch (value) {
+                    case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
+                        options[i] = context.getString(R.string.value_integer_meter_recommended, value);
+                        break;
+                    case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
+                        options[i] = context.getString(R.string.value_integer_meter_excellent_gps, value);
+                        break;
+                    case PreferencesUtils.RECORDING_GPS_ACCURACY_POOR:
+                        options[i] = context.getString(R.string.value_integer_meter_poor_gps, value);
+                        break;
+                    default:
+                        options[i] = displayValue;
+                }
+            } else {
+                int feet = (int) (value * UnitConversions.M_TO_FT);
+                if (feet < 2000) {
+                    displayValue = context.getString(R.string.value_integer_feet, feet);
+                    switch (value) {
+                        case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
+                            options[i] = context.getString(R.string.value_integer_feet_recommended, feet);
+                            break;
+                        case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
+                            options[i] = context.getString(R.string.value_integer_feet_excellent_gps, feet);
+                            break;
+                        default:
+                            options[i] = displayValue;
+                    }
+                } else {
+                    double mile = feet * UnitConversions.FT_TO_MI;
+                    displayValue = context.getString(R.string.value_float_mile, mile);
+                    if (value == PreferencesUtils.RECORDING_GPS_ACCURACY_POOR) {
+                        options[i] = context.getString(R.string.value_float_mile_poor_gps, mile);
+                    } else {
+                        options[i] = displayValue;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the auto resume track timeout options.
+     *
+     * @param options the options
+     * @param values  the values
+     */
+    static void setAutoResumeTrackTimeoutOptions(Context context, String[] options, String[] values) {
+        for (int i = 0; i < values.length; i++) {
+            int value = Integer.parseInt(values[i]);
+            switch (value) {
+                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_NEVER:
+                    options[i] = context.getString(R.string.value_never);
+                    break;
+                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_ALWAYS:
+                    options[i] = context.getString(R.string.value_always);
+                    break;
+                default:
+                    options[i] = context.getString(R.string.value_integer_minute, value);
+            }
+        }
+    }
+
+    /**
+     * Configures the bluetooth sensor.
+     */
+    static void configureBluetoothSensorList(ListPreference preference) {
+        Context context = preference.getContext();
+
+        String value = PreferencesUtils.getString(context, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        List<String> devicesNameList = new ArrayList<>();
+        List<String> devicesAddressList = new ArrayList<>();
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter != null) {
+            BluetoothDeviceUtils.populateDeviceLists(bluetoothAdapter, devicesNameList, devicesAddressList);
+        }
+
+        // Was the previously configured device unpaired? Then forget it.
+        if (!devicesAddressList.contains(value)) {
+            value = PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT;
+            PreferencesUtils.setString(context, R.string.bluetooth_sensor_key, value);
+        }
+
+        devicesNameList.add(0, context.getString(R.string.value_none));
+        devicesAddressList.add(0, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+
+        String[] values = devicesAddressList.toArray(new String[0]);
+        preference.setEntryValues(values);
+
+        String[] options = devicesNameList.toArray(new String[0]);
+        preference.setEntries(options);
+    }
+}

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

@@ -1,303 +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.settings;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
-import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.util.UnitConversions;
-
-/**
- * An activity for accessing recording settings.
- *
- * @author Jimmy Shih
- */
-public class RecordingSettingsActivity extends PreferenceActivity implements ChooseActivityTypeCaller {
-
-    private static final int DIALOG_CHOOSE_ACTIVITY = 0;
-
-    private ActivityTypePreference activityTypePreference;
-
-    @Override
-    protected void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        addPreferencesFromResource(R.xml.settings_recording);
-
-        boolean metricUnits = PreferencesUtils.isMetricUnits(this);
-
-        configFrequencyPreference(R.string.voice_frequency_key, metricUnits);
-        configFrequencyPreference(R.string.split_frequency_key, metricUnits);
-        configDefaultActivity();
-        configListPreference(R.string.min_recording_interval_key, R.array.min_recording_interval_values, metricUnits);
-        configListPreference(R.string.recording_distance_interval_key, R.array.recording_distance_interval_values, metricUnits);
-        configListPreference(R.string.max_recording_distance_key, R.array.max_recording_distance_values, metricUnits);
-        configListPreference(R.string.recording_gps_accuracy_key, R.array.recording_gps_accuracy_values, metricUnits);
-        configListPreference(R.string.auto_resume_track_timeout_key, R.array.auto_resume_track_timeout_values, metricUnits);
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id, Bundle bundle) {
-        if (id != DIALOG_CHOOSE_ACTIVITY) {
-            return null;
-        }
-
-        String category = PreferencesUtils.getString(
-                this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
-        return ChooseActivityTypeDialogFragment.getDialog(this, category, this);
-    }
-
-    private void configFrequencyPreference(int key, boolean metricUnits) {
-        ListPreference preference = (ListPreference) findPreference(getString(key));
-
-        String[] options = StringUtils.getFrequencyOptions(this, metricUnits);
-        preference.setEntries(options);
-    }
-
-    private void configDefaultActivity() {
-        activityTypePreference = (ActivityTypePreference) findPreference(getString(R.string.default_activity_key));
-        String defaultActivity = PreferencesUtils.getString(
-                this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
-        activityTypePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference pref, Object newValue) {
-                String stringValue = (String) newValue;
-                pref.setSummary(stringValue != null && !stringValue.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? stringValue : getString(R.string.value_unknown));
-                return true;
-            }
-        });
-        activityTypePreference.setSummary(defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getString(R.string.value_unknown));
-        activityTypePreference.setRecordingSettingsActivity(this);
-    }
-
-    private void configListPreference(int key, int valueArray, boolean metricUnits) {
-        ListPreference preference = (ListPreference) findPreference(getString(key));
-
-        @Deprecated //TODO Can we make values an int array?
-        String[] values = getResources().getStringArray(valueArray);
-        String[] options = new String[values.length];
-        switch (key) {
-            case R.string.min_recording_interval_key:
-                setMinRecordingIntervalOptions(options, values);
-                break;
-            case R.string.recording_distance_interval_key:
-                setRecordingDistanceIntervalOptions(options, values, metricUnits);
-                break;
-            case R.string.max_recording_distance_key:
-                setMaxRecordingDistanceOptions(options, values, metricUnits);
-                break;
-            case R.string.recording_gps_accuracy_key:
-                setRecordingGpsAccuracyOptions(options, values, metricUnits);
-                break;
-            case R.string.auto_resume_track_timeout_key:
-                setAutoResumeTrackTimeoutOptions(options, values);
-                break;
-            default:
-                return;
-        }
-
-        preference.setEntries(options);
-    }
-
-    /**
-     * Sets the min recording interval options.
-     *
-     * @param options the options
-     * @param values  the values
-     */
-    private void setMinRecordingIntervalOptions(String[] options, String[] values) {
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            switch (value) {
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE:
-                    options[i] = getString(R.string.value_adapt_battery_life);
-                    break;
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_ADAPT_ACCURACY:
-                    options[i] = getString(R.string.value_adapt_accuracy);
-                    break;
-                case PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT:
-                    options[i] = getString(R.string.value_smallest_recommended);
-                    break;
-                default:
-                    options[i] = value < 60 ? getString(R.string.value_integer_second, value)
-                            : getString(R.string.value_integer_minute, value / 60);
-            }
-        }
-    }
-
-    /**
-     * Sets the recording distance interval options.
-     *
-     * @param options     the options
-     * @param values      the values
-     * @param metricUnits true for metric units
-     */
-    private void setRecordingDistanceIntervalOptions(String[] options, String[] values, boolean metricUnits) {
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            String displayValue;
-            if (metricUnits) {
-                displayValue = getString(R.string.value_integer_meter, value);
-                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
-                    options[i] = getString(R.string.value_integer_meter_recommended, value);
-                } else {
-                    options[i] = displayValue;
-                }
-            } else {
-                int feet = (int) (value * UnitConversions.M_TO_FT);
-                displayValue = getString(R.string.value_integer_feet, feet);
-                if (value == PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT) {
-                    options[i] = getString(R.string.value_integer_feet_recommended, feet);
-                } else {
-                    options[i] = displayValue;
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the max recording distance options.
-     *
-     * @param options     the options
-     * @param values      the values
-     * @param metricUnits true for metric units
-     */
-    private void setMaxRecordingDistanceOptions(String[] options, String[] values, boolean metricUnits) {
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            String displayValue;
-            if (metricUnits) {
-                displayValue = getString(R.string.value_integer_meter, value);
-                if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
-                    options[i] = getString(R.string.value_integer_meter_recommended, value);
-                } else {
-                    options[i] = displayValue;
-                }
-            } else {
-                int feet = (int) (value * UnitConversions.M_TO_FT);
-                if (feet < 2000) {
-                    displayValue = getString(R.string.value_integer_feet, feet);
-                    if (value == PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT) {
-                        options[i] = getString(R.string.value_integer_feet_recommended, feet);
-                    } else {
-                        options[i] = displayValue;
-                    }
-                } else {
-                    double mile = feet * UnitConversions.FT_TO_MI;
-                    displayValue = getString(R.string.value_float_mile, mile);
-                    options[i] = displayValue;
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the recording gps accuracy options.
-     *
-     * @param options     the options
-     * @param values      the values
-     * @param metricUnits true for metric units
-     */
-    private void setRecordingGpsAccuracyOptions(String[] options, String[] values, boolean metricUnits) {
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            String displayValue;
-            if (metricUnits) {
-                displayValue = getString(R.string.value_integer_meter, value);
-                switch (value) {
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
-                        options[i] = getString(R.string.value_integer_meter_recommended, value);
-                        break;
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
-                        options[i] = getString(R.string.value_integer_meter_excellent_gps, value);
-                        break;
-                    case PreferencesUtils.RECORDING_GPS_ACCURACY_POOR:
-                        options[i] = getString(R.string.value_integer_meter_poor_gps, value);
-                        break;
-                    default:
-                        options[i] = displayValue;
-                }
-            } else {
-                int feet = (int) (value * UnitConversions.M_TO_FT);
-                if (feet < 2000) {
-                    displayValue = getString(R.string.value_integer_feet, feet);
-                    switch (value) {
-                        case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
-                            options[i] = getString(R.string.value_integer_feet_recommended, feet);
-                            break;
-                        case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
-                            options[i] = getString(R.string.value_integer_feet_excellent_gps, feet);
-                            break;
-                        default:
-                            options[i] = displayValue;
-                    }
-                } else {
-                    double mile = feet * UnitConversions.FT_TO_MI;
-                    displayValue = getString(R.string.value_float_mile, mile);
-                    if (value == PreferencesUtils.RECORDING_GPS_ACCURACY_POOR) {
-                        options[i] = getString(R.string.value_float_mile_poor_gps, mile);
-                    } else {
-                        options[i] = displayValue;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the auto resume track timeout options.
-     *
-     * @param options the options
-     * @param values  the values
-     */
-    private void setAutoResumeTrackTimeoutOptions(String[] options, String[] values) {
-        for (int i = 0; i < values.length; i++) {
-            int value = Integer.parseInt(values[i]);
-            switch (value) {
-                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_NEVER:
-                    options[i] = getString(R.string.value_never);
-                    break;
-                case PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_ALWAYS:
-                    options[i] = getString(R.string.value_always);
-                    break;
-                default:
-                    options[i] = getString(R.string.value_integer_minute, value);
-            }
-        }
-    }
-
-    public void showChooseActivityTypeDialog() {
-        try {
-            removeDialog(DIALOG_CHOOSE_ACTIVITY);
-        } catch (Exception e) {
-            // Can safely ignore.
-        }
-        showDialog(DIALOG_CHOOSE_ACTIVITY);
-    }
-
-    @Override
-    public void onChooseActivityTypeDone(String iconValue) {
-        activityTypePreference.updateValue(iconValue);
-    }
-}

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

@@ -1,11 +1,13 @@
 package de.dennisguse.opentracks.settings;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.preference.DialogPreference;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.widget.Toast;
 
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceDialogFragment;
+
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
@@ -15,13 +17,24 @@ public class ResetDialogPreference extends DialogPreference {
         super(context, attrs);
     }
 
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        super.onClick(dialog, which);
-        if (which == DialogInterface.BUTTON_POSITIVE) {
-            PreferencesUtils.resetPreferences(getContext(), true);
+    public static class ResetPreferenceDialog extends PreferenceDialogFragment {
 
-            Toast.makeText(getContext(), R.string.settings_reset_done, Toast.LENGTH_SHORT).show();
+        static PreferenceDialogFragment newInstance(String preferenceKey) {
+            ResetPreferenceDialog dialog = new ResetPreferenceDialog();
+            final Bundle bundle = new Bundle(1);
+            bundle.putString(PreferenceDialogFragment.ARG_KEY, preferenceKey);
+            dialog.setArguments(bundle);
+
+            return dialog;
+        }
+
+        @Override
+        public void onDialogClosed(boolean positiveResult) {
+            if (positiveResult) {
+                PreferencesUtils.resetPreferences(getActivity(), true);
+
+                Toast.makeText(getActivity(), R.string.settings_reset_done, Toast.LENGTH_SHORT).show();
+            }
         }
     }
 }

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

@@ -1,159 +1,175 @@
-/*
- * Copyright 2008 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.settings;
 
-import android.bluetooth.BluetoothAdapter;
-import android.content.Intent;
+import android.app.DialogFragment;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.provider.Settings;
 
-import java.util.ArrayList;
-import java.util.List;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragment;
 
 import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.BluetoothDeviceUtils;
-import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
 
-/**
- * An activity for accessing settings.
- *
- * @author Jimmy Shih
- */
-public class SettingsActivity extends PreferenceActivity {
+public class SettingsActivity extends FragmentActivity implements ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller {
 
-    private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-
-    /*
-     * Note that sharedPreferenceChangeListenr cannot be an anonymous inner class.
-     * Anonymous inner class will get garbage collected.
-     */
-    private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-        @Override
-        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (key != null && key.equals(PreferencesUtils.getKey(SettingsActivity.this, R.string.recording_track_id_key))) {
-                recordingTrackId = PreferencesUtils.getLong(SettingsActivity.this, R.string.recording_track_id_key);
-            }
-
-            //TODO Should only be called if something meaningful happens.
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    updateUI();
-                }
-            });
-        }
-    };
+    private PrefsFragment prefsFragment = new PrefsFragment();
 
     @Override
-    protected void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.settings);
+        getFragmentManager().beginTransaction().replace(android.R.id.content, prefsFragment).commit();
+    }
 
-        configPreference(R.string.settings_stats_key, StatsSettingsActivity.class);
-        configPreference(R.string.settings_recording_key, RecordingSettingsActivity.class);
+    @Override
+    public void onChooseActivityTypeDone(String iconValue) {
+        prefsFragment.setDefaultActivity(iconValue);
+    }
 
-        findPreference(getString(R.string.settings_sensor_bluetooth_pairing_key))
-                .setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                    public boolean onPreferenceClick(Preference preference) {
-                        Intent settingsIntent = new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
-                        startActivity(settingsIntent);
-                        return true;
+    public static class PrefsFragment extends PreferenceFragment {
+
+        /*
+         * Note that sharedPreferenceChangeListener cannot be an anonymous inner class.
+         * Anonymous inner class will get garbage collected.
+         */
+        private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        updateUI();
                     }
                 });
-    }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        PreferencesUtils.getSharedPreferences(this).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-        recordingTrackId = PreferencesUtils.getLong(this, R.string.recording_track_id_key);
-        updateUI();
-
-        configBluetoothSensor();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        PreferencesUtils.getSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
-    }
-
-    /**
-     * Configures a preference by starting a new activity when it is clicked.
-     *
-     * @param key the preference key
-     * @param cl  the class to start the new activity
-     */
-    private void configPreference(int key, final Class<?> cl) {
-        Preference preference = findPreference(getString(key));
-        preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference pref) {
-                Intent intent = IntentUtils.newIntent(SettingsActivity.this, cl);
-                startActivity(intent);
-                return true;
+                if (key == null || key.equals(PreferencesUtils.getKey(getActivity(), R.string.stats_units_key))) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            updateUnits();
+                        }
+                    });
+                }
             }
-        });
-    }
+        };
 
-    /**
-     * Configures the bluetooth sensor.
-     */
-    private void configBluetoothSensor() {
-        ListPreference preference = (ListPreference) findPreference(getString(R.string.bluetooth_sensor_key));
-        String value = PreferencesUtils.getString(this, R.string.bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
-        List<String> devicesNameList = new ArrayList<>();
-        List<String> devicesAddressList = new ArrayList<>();
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-        if (bluetoothAdapter != null) {
-            BluetoothDeviceUtils.populateDeviceLists(bluetoothAdapter, devicesNameList, devicesAddressList);
+        // Used to forward update from ChooseActivityTypeDialogFragment; TODO Could be replaced with LiveData.
+        private ActivityTypePreference.ActivityPreferenceDialog activityPreferenceDialog;
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            addPreferencesFromResource(R.xml.settings);
+            updateUnits();
         }
 
-        // Was the previously configured device unpaired? Then forget it.
-        if (!devicesAddressList.contains(value)) {
-            value = PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT;
-            PreferencesUtils.setString(this, R.string.bluetooth_sensor_key, value);
+        @Override
+        public void onResume() {
+            super.onResume();
+            PreferencesUtils.getSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+            updateUI();
         }
 
-        devicesNameList.add(0, getString(R.string.value_none));
-        devicesAddressList.add(0, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        @Override
+        public void onPause() {
+            super.onPause();
+            PreferencesUtils.getSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+        }
 
-        String[] values = devicesAddressList.toArray(new String[0]);
-        preference.setEntryValues(values);
+        private void configFrequencyPreference(int key, boolean metricUnits) {
+            ListPreference preference = findPreference(getString(key));
 
-        String[] options = devicesNameList.toArray(new String[0]);
-        preference.setEntries(options);
-    }
+            String[] options = StringUtils.getFrequencyOptions(getActivity(), metricUnits);
+            preference.setEntries(options);
+        }
 
-    private void updateUI() {
-        //TODO Remove the following if recordingTrackId is replaced by direct communication rather than via preferences.
-        boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
-        Preference resetPreference = findPreference(getString(R.string.settings_reset_key));
-        resetPreference.setSummary(isRecording ? getString(R.string.settings_not_while_recording) : "");
-        resetPreference.setEnabled(!isRecording);
+        private void configListPreference(int key, int valueArray, boolean metricUnits) {
+            //TODO Can we make values an int array?
+            String[] values = getResources().getStringArray(valueArray);
+            final String[] options = new String[values.length];
+            switch (key) {
+                case R.string.min_recording_interval_key:
+                    PreferenceHelper.setMinRecordingIntervalOptions(getActivity(), options, values);
+                    break;
+                case R.string.recording_distance_interval_key:
+                    PreferenceHelper.setRecordingDistanceIntervalOptions(getActivity(), options, values, metricUnits);
+                    break;
+                case R.string.max_recording_distance_key:
+                    PreferenceHelper.setMaxRecordingDistanceOptions(getActivity(), options, values, metricUnits);
+                    break;
+                case R.string.recording_gps_accuracy_key:
+                    PreferenceHelper.setRecordingGpsAccuracyOptions(getActivity(), options, values, metricUnits);
+                    break;
+                case R.string.auto_resume_track_timeout_key:
+                    PreferenceHelper.setAutoResumeTrackTimeoutOptions(getActivity(), options, values);
+                    break;
+                default:
+                    return;
+            }
 
-        Preference speedCheckBoxPreference = findPreference(getString(R.string.chart_show_speed_key));
-        speedCheckBoxPreference.setTitle(PreferencesUtils.isReportSpeed(this) ? R.string.stats_speed : R.string.stats_pace);
+            final ListPreference listPreference = findPreference(getString(key));
+            listPreference.setEntries(options);
+        }
+
+        @Override
+        public void onDisplayPreferenceDialog(Preference preference) {
+            DialogFragment dialogFragment = null;
+            if (preference instanceof ResetDialogPreference) {
+                dialogFragment = ResetDialogPreference.ResetPreferenceDialog.newInstance(preference.getKey());
+            } else if (preference instanceof ActivityTypePreference) {
+                activityPreferenceDialog = ActivityTypePreference.ActivityPreferenceDialog.newInstance(preference.getKey());
+                dialogFragment = activityPreferenceDialog;
+            }
+
+            if (dialogFragment != null) {
+                dialogFragment.setTargetFragment(this, 0);
+                dialogFragment.show(getFragmentManager(), getClass().getSimpleName());
+                return;
+            }
+
+            super.onDisplayPreferenceDialog(preference);
+        }
+
+        public void setDefaultActivity(String iconValue) {
+            if (activityPreferenceDialog != null) {
+                activityPreferenceDialog.updateUI(iconValue);
+            }
+        }
+
+        private void updateUI() {
+            final boolean isRecording = PreferencesUtils.isRecording(getActivity());
+            Preference resetPreference = findPreference(getString(R.string.settings_reset_key));
+            resetPreference.setSummary(isRecording ? getString(R.string.settings_not_while_recording) : "");
+            resetPreference.setEnabled(!isRecording);
+
+            Preference speedCheckBoxPreference = findPreference(getString(R.string.chart_show_speed_key));
+            speedCheckBoxPreference.setTitle(PreferencesUtils.isReportSpeed(getActivity()) ? R.string.stats_speed : R.string.stats_pace);
+
+            ListPreference bluetoothPreference = findPreference(getString(R.string.bluetooth_sensor_key));
+            PreferenceHelper.configureBluetoothSensorList(bluetoothPreference);
+        }
+
+        private void updateUnits() {
+            boolean metricUnits = PreferencesUtils.isMetricUnits(getActivity());
+
+            configFrequencyPreference(R.string.voice_frequency_key, metricUnits);
+            configFrequencyPreference(R.string.split_frequency_key, metricUnits);
+            configListPreference(R.string.min_recording_interval_key, R.array.min_recording_interval_values, metricUnits);
+            configListPreference(R.string.recording_distance_interval_key, R.array.recording_distance_interval_values, metricUnits);
+            configListPreference(R.string.max_recording_distance_key, R.array.max_recording_distance_values, metricUnits);
+            configListPreference(R.string.recording_gps_accuracy_key, R.array.recording_gps_accuracy_values, metricUnits);
+            configListPreference(R.string.auto_resume_track_timeout_key, R.array.auto_resume_track_timeout_values, metricUnits);
+            configListPreference(R.string.auto_resume_track_timeout_key, R.array.auto_resume_track_timeout_values, metricUnits);
+
+            final ListPreference statsRatePreferences = findPreference(getString(R.string.stats_rate_key));
+            String[] options = getResources().getStringArray(metricUnits ? R.array.stats_rate_metric_options : R.array.stats_rate_imperial_options);
+            statsRatePreferences.setEntries(options);
+            //TODO This is a hack!!! Need to manually updated the summary as otherwise it will only be updated after scrolling down and up again (bring the object out of view).
+            //Check if this is still needed after upgraded PreferenceFragment.
+            statsRatePreferences.setSummary(statsRatePreferences.getEntry());
+        }
     }
 }

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

@@ -1,78 +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.settings;
-
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceActivity;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.util.PreferencesUtils;
-
-/**
- * An activity for accessing stats settings.
- *
- * @author Jimmy Shih
- */
-public class StatsSettingsActivity extends PreferenceActivity {
-
-    @Override
-    protected void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        addPreferencesFromResource(R.xml.settings_statistics);
-
-        configUnitsListPreference();
-        boolean metricUnits = PreferencesUtils.STATS_UNITS_DEFAULT.equals(PreferencesUtils.getString(this, R.string.stats_units_key, ""));
-        configRateListPreference(metricUnits);
-    }
-
-    /**
-     * Configures the preferred units list preference.
-     */
-    private void configUnitsListPreference() {
-        ListPreference listPreference = (ListPreference) findPreference(getString(R.string.stats_units_key));
-        final OnPreferenceChangeListener listener = new OnPreferenceChangeListener() {
-
-            @Override
-            public boolean onPreferenceChange(Preference pref, Object newValue) {
-                boolean metricUnits = PreferencesUtils.STATS_UNITS_DEFAULT.equals(newValue);
-                configRateListPreference(metricUnits);
-                return true;
-            }
-        };
-        listPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference pref, Object newValue) {
-                return listener.onPreferenceChange(pref, newValue);
-            }
-        });
-    }
-
-    /**
-     * Configures the preferred rate list preference.
-     *
-     * @param metricUnits true if metric units
-     */
-    private void configRateListPreference(boolean metricUnits) {
-        ListPreference listPreference = (ListPreference) findPreference(getString(R.string.stats_rate_key));
-        String[] options = getResources().getStringArray(metricUnits ? R.array.stats_rate_metric_options : R.array.stats_rate_imperial_options);
-
-        listPreference.setEntries(options);
-    }
-}

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

@@ -19,7 +19,8 @@ package de.dennisguse.opentracks.util;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.preference.PreferenceManager;
+
+import androidx.preference.PreferenceManager;
 
 import de.dennisguse.opentracks.R;
 
@@ -252,9 +253,16 @@ public class PreferencesUtils {
         return CHART_X_AXIS_DEFAULT.equals(getString(context, R.string.chart_x_axis_key, CHART_X_AXIS_DEFAULT));
     }
 
+    public static boolean isRecording(Context context) {
+        long recordingTrackId = PreferencesUtils.getLong(context, R.string.recording_track_id_key);
+        return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+    }
+
+    public static boolean isRecording(long recordingTrackId) {
+        return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
+    }
+
     public static void resetPreferences(Context context, boolean readAgain) {
         PreferenceManager.setDefaultValues(context, R.xml.settings, readAgain);
-        PreferenceManager.setDefaultValues(context, R.xml.settings_recording, readAgain);
-        PreferenceManager.setDefaultValues(context, R.xml.settings_statistics, readAgain);
     }
 }

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

@@ -62,7 +62,7 @@ public class TrackIconUtils {
     private static final LinkedHashMap<String, Pair<Integer, Integer>> MAP = new LinkedHashMap<>();
 
     static {
-        //Reflects order in ChooseActivityTypeDialogFragment
+        //Reflects order in ChooseActivityTypeDialogFragmentActivity
         MAP.put(UNKNOWN, new Pair<>(R.string.activity_type_unknown, ACTIVITY_UNKNOWN_LOGO));
         MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_activity_run_24dp));
         MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_activity_walk_24dp));

src/main/res/values/themes_custom.xml

@@ -30,6 +30,7 @@ limitations under the License.
         <item name="android:actionBarStyle">@style/ActionBarStyleCustom</item>
         <item name="android:actionModeBackground">@drawable/custom_action_mode_background</item>
         <item name="android:alertDialogTheme">@style/CustomAlertDialogTheme</item>
+        <item name="android:colorAccent">@color/holo_orange_dark</item>
     </style>
 
     <style name="ThemeCustomTransparent" parent="ThemeCustom">

src/main/res/xml/settings.xml

@@ -15,7 +15,36 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/menu_settings">
-    <PreferenceScreen android:title="@string/track_detail_chart_tab">
+
+    <PreferenceCategory android:title="@string/track_detail_stats_tab">
+        <ListPreference
+            android:defaultValue="@string/stats_units_metric"
+            android:entries="@array/stats_units_options"
+            android:entryValues="@array/stats_units_values"
+            android:key="@string/stats_units_key"
+            android:summary="%s"
+            android:title="@string/settings_stats_units_title" />
+        <ListPreference
+            android:defaultValue="@string/stats_rate_speed"
+            android:entries="@array/stats_rate_metric_options"
+            android:entryValues="@array/stats_rate_values"
+            android:key="@string/stats_rate_key"
+            android:summary="%s"
+            android:title="@string/settings_stats_rate_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_show">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/stats_show_grade_elevation_key"
+            android:title="@string/settings_stats_grade_elevation" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/stats_show_coordinate_key"
+            android:title="@string/settings_stats_coordinate" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/track_detail_chart_tab">
         <ListPreference
             android:defaultValue="@string/chart_x_axis_distance"
             android:entries="@array/chart_x_axis_options"
@@ -23,57 +52,97 @@ limitations under the License.
             android:key="@string/chart_x_axis_key"
             android:summary="%s"
             android:title="@string/settings_chart_x_axis" />
-        <PreferenceCategory android:title="@string/settings_show">
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="@string/chart_show_elevation_key"
-                android:title="@string/stats_elevation" />
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="@string/chart_show_speed_key" />
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="@string/chart_show_heart_rate_key"
-                android:title="@string/sensor_state_heart_rate" />
-            <!--
-            TODO: Sensors are not implemented.
-                <CheckBoxPreference
-                  android:defaultValue="true"
-                  android:key="@string/chart_show_cadence_key"
-                  android:title="@string/sensor_state_cadence" />
-                <CheckBoxPreference
-                  android:defaultValue="true"
-                  android:key="@string/chart_show_power_key"
-                  android:title="@string/sensor_state_power" />
-            -->
-        </PreferenceCategory>
-    </PreferenceScreen>
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_elevation_key"
+            android:title="@string/stats_elevation" />
+        <!-- title set in code -->
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_speed_key" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/chart_show_heart_rate_key"
+            android:title="@string/sensor_state_heart_rate" />
+    </PreferenceCategory>
 
-    <Preference
-        android:key="@string/settings_stats_key"
-        android:persistent="false"
-        android:title="@string/track_detail_stats_tab" />
-    <Preference
-        android:key="@string/settings_recording_key"
-        android:persistent="false"
-        android:title="@string/settings_recording" />
+    <PreferenceCategory android:title="@string/settings_recording">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/trackdetail_show_on_lockscreen_while_recording_key"
+            android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
+            android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
+        <ListPreference
+            android:defaultValue="0"
+            android:entryValues="@array/frequency_values"
+            android:key="@string/voice_frequency_key"
+            android:summary="%s"
+            android:title="@string/menu_voice_frequency" />
+        <ListPreference
+            android:defaultValue="0"
+            android:entryValues="@array/frequency_values"
+            android:key="@string/split_frequency_key"
+            android:summary="%s"
+            android:title="@string/menu_split_frequency" />
+        <ListPreference
+            android:defaultValue="@string/settings_recording_track_name_date_iso_8601_value"
+            android:entries="@array/track_name_options"
+            android:entryValues="@array/track_name_values"
+            android:key="@string/track_name_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_track_name_title" />
+        <ListPreference
+            android:defaultValue="0"
+            android:entryValues="@array/min_recording_interval_values"
+            android:key="@string/min_recording_interval_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_min_recording_interval_title" />
+        <ListPreference
+            android:defaultValue="10"
+            android:entryValues="@array/recording_distance_interval_values"
+            android:key="@string/recording_distance_interval_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_min_recording_distance_title" />
+        <ListPreference
+            android:defaultValue="200"
+            android:entryValues="@array/max_recording_distance_values"
+            android:key="@string/max_recording_distance_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_max_recording_distance_title" />
+        <ListPreference
+            android:defaultValue="50"
+            android:entryValues="@array/recording_gps_accuracy_values"
+            android:key="@string/recording_gps_accuracy_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_min_required_accuracy_title" />
+        <ListPreference
+            android:defaultValue="10"
+            android:entries="@array/auto_resume_track_timeout_values"
+            android:entryValues="@array/auto_resume_track_timeout_values"
+            android:key="@string/auto_resume_track_timeout_key"
+            android:summary="%s"
+            android:title="@string/settings_recording_auto_resume_track_timeout_title" />
+        <de.dennisguse.opentracks.settings.ActivityTypePreference
+            android:defaultValue="@string/activity_type_running"
+            android:key="@string/default_activity_key"
+            android:title="@string/settings_recording_default_activity_title" />
+    </PreferenceCategory>
 
-    <PreferenceScreen
+    <PreferenceCategory
         android:title="@string/settings_sensor">
-        <PreferenceCategory
-            android:title="@string/settings_sensor_bluetooth">
-            <Preference
-                android:key="@string/settings_sensor_bluetooth_pairing_key"
-                android:persistent="false"
-                android:summary="@string/settings_sensor_bluetooth_pairing_summary"
-                android:title="@string/settings_sensor_bluetooth_pairing" />
-            <ListPreference
-                android:defaultValue="@string/sensor_type_value_none"
-                android:key="@string/bluetooth_sensor_key"
-                android:summary="%s"
-                android:title="@string/settings_sensor_bluetooth_sensor" />
-        </PreferenceCategory>
-    </PreferenceScreen>
+        <ListPreference
+            android:defaultValue="@string/sensor_type_value_none"
+            android:key="@string/bluetooth_sensor_key"
+            android:summary="%s"
+            android:title="@string/settings_sensor_bluetooth_sensor" />
+        <Preference
+            android:key="@string/settings_sensor_bluetooth_pairing_key"
+            android:persistent="false"
+            android:summary="@string/settings_sensor_bluetooth_pairing_summary"
+            android:title="@string/settings_sensor_bluetooth_pairing">
+            <intent android:action="android.settings.BLUETOOTH_SETTINGS" />
+        </Preference>
+    </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/generic_tracks">
         <Preference android:title="@string/menu_import_all">
@@ -90,14 +159,15 @@ limitations under the License.
 
     <PreferenceCategory android:title="@string/settings_reset">
         <de.dennisguse.opentracks.settings.ResetDialogPreference
-            android:dialogMessage="@string/settings_reset_confirm_message"
             android:dialogTitle="@string/settings_reset_confirm_title"
+            android:dialogMessage="@string/settings_reset_confirm_message"
             android:key="@string/settings_reset_key"
             android:negativeButtonText="@string/generic_cancel"
             android:persistent="false"
             android:positiveButtonText="@string/generic_yes"
             android:title="@string/settings_reset" />
     </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/about_preference_title">
         <Preference android:title="@string/about_preference_title">
             <intent

src/main/res/xml/settings_recording.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/settings_recording">
-    <ListPreference
-        android:defaultValue="0"
-        android:entryValues="@array/frequency_values"
-        android:key="@string/voice_frequency_key"
-        android:summary="%s"
-        android:title="@string/menu_voice_frequency" />
-    <ListPreference
-        android:defaultValue="0"
-        android:entryValues="@array/frequency_values"
-        android:key="@string/split_frequency_key"
-        android:summary="%s"
-        android:title="@string/menu_split_frequency" />
-    <ListPreference
-        android:defaultValue="@string/settings_recording_track_name_date_iso_8601_value"
-        android:entries="@array/track_name_options"
-        android:entryValues="@array/track_name_values"
-        android:key="@string/track_name_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_track_name_title" />
-    <ListPreference
-        android:defaultValue="0"
-        android:entryValues="@array/min_recording_interval_values"
-        android:key="@string/min_recording_interval_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_min_recording_interval_title" />
-    <ListPreference
-        android:defaultValue="10"
-        android:entryValues="@array/recording_distance_interval_values"
-        android:key="@string/recording_distance_interval_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_min_recording_distance_title" />
-    <ListPreference
-        android:defaultValue="200"
-        android:entryValues="@array/max_recording_distance_values"
-        android:key="@string/max_recording_distance_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_max_recording_distance_title" />
-    <ListPreference
-        android:defaultValue="50"
-        android:entryValues="@array/recording_gps_accuracy_values"
-        android:key="@string/recording_gps_accuracy_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_min_required_accuracy_title" />
-    <ListPreference
-        android:defaultValue="10"
-        android:entryValues="@array/auto_resume_track_timeout_values"
-        android:key="@string/auto_resume_track_timeout_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_auto_resume_track_timeout_title" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="@string/trackdetail_show_on_lockscreen_while_recording_key"
-        android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
-        android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
-    <de.dennisguse.opentracks.settings.ActivityTypePreference
-        android:defaultValue="@string/activity_type_running"
-        android:key="@string/default_activity_key"
-        android:summary="%s"
-        android:title="@string/settings_recording_default_activity_title" />
-</PreferenceScreen>

src/main/res/xml/settings_statistics.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-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.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/track_detail_stats_tab">
-    <ListPreference
-        android:defaultValue="@string/stats_units_metric"
-        android:entries="@array/stats_units_options"
-        android:entryValues="@array/stats_units_values"
-        android:key="@string/stats_units_key"
-        android:summary="%s"
-        android:title="@string/settings_stats_units_title" />
-    <ListPreference
-        android:defaultValue="@string/stats_rate_speed"
-        android:entries="@array/stats_rate_metric_options"
-        android:entryValues="@array/stats_rate_values"
-        android:key="@string/stats_rate_key"
-        android:summary="%s"
-        android:title="@string/settings_stats_rate_title" />
-    <PreferenceCategory android:title="@string/settings_show">
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="@string/stats_show_grade_elevation_key"
-            android:title="@string/settings_stats_grade_elevation" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="@string/stats_show_coordinate_key"
-            android:title="@string/settings_stats_coordinate" />
-    </PreferenceCategory>
-</PreferenceScreen>