diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index 325b50d64..2289cf17f 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -151,27 +151,6 @@ public class TrackRecordingServiceTestLooper { fullRecordingSession(); } - @MediumTest - @Test - public void testWithProperties_splitFrequencyDefault() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.split_frequency_key, Integer.parseInt(context.getResources().getString(R.string.split_frequency_default))); - fullRecordingSession(); - } - - @MediumTest - @Test - public void testWithProperties_splitFrequencyByDistance() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.split_frequency_key, -1); - fullRecordingSession(); - } - - @MediumTest - @Test - public void testWithProperties_splitFrequencyByTime() throws TimeoutException { - PreferencesUtils.setInt(context, R.string.split_frequency_key, 1); - fullRecordingSession(); - } - @MediumTest @Test public void testWithProperties_metricUnitsDefault() throws TimeoutException { diff --git a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java index bded8463d..6099c1f3c 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java @@ -71,8 +71,7 @@ public class MarkerEditActivity extends AbstractActivity { waypointSection = findViewById(R.id.marker_edit_waypoint_section); waypointName = findViewById(R.id.marker_edit_waypoint_name); waypointMarkerType = findViewById(R.id.marker_edit_waypoint_marker_type); - ArrayAdapter adapter = ArrayAdapter.createFromResource( - this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line); + ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.waypoint_types, android.R.layout.simple_dropdown_item_1line); waypointMarkerType.setAdapter(adapter); waypointDescription = findViewById(R.id.marker_edit_waypoint_description); diff --git a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java index 55df1d129..7c55b4667 100644 --- a/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java @@ -39,7 +39,6 @@ import androidx.loader.content.Loader; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.Track; -import de.dennisguse.opentracks.content.Waypoint.WaypointType; import de.dennisguse.opentracks.content.WaypointsColumns; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller; @@ -152,7 +151,6 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker resourceCursorAdapter = new ResourceCursorAdapter(this, R.layout.list_item, null, 0) { @Override public void bindView(View view, Context context, Cursor cursor) { - int typeIndex = cursor.getColumnIndex(WaypointsColumns.TYPE); int nameIndex = cursor.getColumnIndex(WaypointsColumns.NAME); int timeIndex = cursor.getColumnIndexOrThrow(WaypointsColumns.TIME); int categoryIndex = cursor.getColumnIndex(WaypointsColumns.CATEGORY); @@ -161,12 +159,11 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker int latitudeIndex = cursor.getColumnIndex(WaypointsColumns.LATITUDE); int longitudeIndex = cursor.getColumnIndex(WaypointsColumns.LONGITUDE); - boolean statistics = WaypointType.values()[cursor.getInt(typeIndex)] == WaypointType.STATISTICS; - int iconId = statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin; + int iconId = R.drawable.ic_marker_blue_pushpin; String name = cursor.getString(nameIndex); long time = cursor.getLong(timeIndex); - String category = statistics ? null : cursor.getString(categoryIndex); - String description = statistics ? null : cursor.getString(descriptionIndex); + String category = cursor.getString(categoryIndex); + String description = cursor.getString(descriptionIndex); String photoUrl = cursor.getString(photoUrlIndex); double latitude = cursor.getDouble(latitudeIndex); double longitude = cursor.getDouble(longitudeIndex); diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index a0950ad5b..a9050ad7a 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -46,7 +46,6 @@ import de.dennisguse.opentracks.content.SearchEngine.ScoredResult; import de.dennisguse.opentracks.content.SearchEngine.SearchQuery; import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.Waypoint; -import de.dennisguse.opentracks.content.Waypoint.WaypointType; import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment; import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller; @@ -393,11 +392,9 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa } } - boolean statistics = waypoint.getType() == WaypointType.STATISTICS; - resultMap.put(IS_RECORDING_FIELD, false); resultMap.put(IS_PAUSED_FIELD, true); - resultMap.put(ICON_ID_FIELD, statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin); + resultMap.put(ICON_ID_FIELD, R.drawable.ic_marker_blue_pushpin); resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_marker); resultMap.put(NAME_FIELD, waypoint.getName()); // Display the marker's track name in the total time field @@ -405,8 +402,8 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa resultMap.put(TOTAL_DISTANCE_FIELD, null); resultMap.put(MARKER_COUNT_FIELD, 0); resultMap.put(START_TIME_FIELD, waypoint.getLocation().getTime()); - resultMap.put(CATEGORY_FIELD, statistics ? null : waypoint.getCategory()); - resultMap.put(DESCRIPTION_FIELD, statistics ? null : waypoint.getDescription()); + resultMap.put(CATEGORY_FIELD, waypoint.getCategory()); + resultMap.put(DESCRIPTION_FIELD, waypoint.getDescription()); resultMap.put(PHOTO_URL_FIELD, waypoint.getPhotoUrl()); resultMap.put(TRACK_ID_FIELD, waypoint.getTrackId()); resultMap.put(MARKER_ID_FIELD, waypoint.getId()); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java index 9d8d97000..4b12d4609 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartView.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartView.java @@ -263,12 +263,9 @@ public class ChartView extends View { pointer = context.getResources().getDrawable(R.drawable.ic_logo_color_24dp); pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight()); - Drawable statisticsMarker = getResources().getDrawable(R.drawable.ic_marker_yellow_pushpin); - markerWidth = statisticsMarker.getIntrinsicWidth(); - markerHeight = statisticsMarker.getIntrinsicHeight(); - statisticsMarker.setBounds(0, 0, markerWidth, markerHeight); - Drawable waypointMarker = getResources().getDrawable(R.drawable.ic_marker_blue_pushpin); + markerWidth = waypointMarker.getIntrinsicWidth(); + markerHeight = waypointMarker.getIntrinsicHeight(); waypointMarker.setBounds(0, 0, markerWidth, markerHeight); scroller = new Scroller(context); diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java index e7aa86a68..98bed99d8 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java @@ -466,12 +466,8 @@ public class TrackDataHub implements DataSourceListener { samplingFrequency = 1 + (int) (numTotalPoints / targetNumPoints); } - if (!LocationUtils.isValidLocation(location)) { - // TODO: also include the last valid point before a split - for (TrackDataListener trackDataListener : sampledInListeners) { - trackDataListener.onSegmentSplit(location); - includeNextPoint = true; - } + if (!LocationUtils.isValidLocation(location)) { //This can be split markers (not anymore supported feature) + includeNextPoint = true; } else { // Also include the last point if the selected track is not recording. if (includeNextPoint || (localNumLoadedPoints % samplingFrequency == 0) || (locationId == lastTrackPointId && !isSelectedTrackRecording())) { diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java index fa461cfcd..72a147599 100644 --- a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java +++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java @@ -51,14 +51,9 @@ public interface TrackDataListener { */ void onSampledOutTrackPoint(Location location); - /** - * Called when an invalid track point representing a segment split is read. - */ - void onSegmentSplit(Location location); - /** * Called when finish sending new track points. - * This gets called after every batch of calls to {@link #onSampledInTrackPoint(Location)}, {@link #onSampledOutTrackPoint(Location)} and {@link #onSegmentSplit(Location)}. + * This gets called after every batch of calls to {@link #onSampledInTrackPoint(Location)} and {@link #onSampledOutTrackPoint(Location)}. */ void onNewTrackPointsDone(); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java index dc090abf3..f188191ef 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java @@ -198,13 +198,6 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene } } - @Override - public void onSegmentSplit(Location location) { - if (isResumed()) { - fillDataPoint(location, null); - } - } - @Override public void onNewTrackPointsDone() { if (isResumed()) { diff --git a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java index 119a9507c..6b89c09a9 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java @@ -41,12 +41,9 @@ import androidx.fragment.app.FragmentActivity; import de.dennisguse.opentracks.MarkerEditActivity; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.Waypoint; -import de.dennisguse.opentracks.content.Waypoint.WaypointType; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.ListItemUtils; -import de.dennisguse.opentracks.util.StatsUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.UnitConversions; @@ -218,43 +215,27 @@ public class MarkerDetailFragment extends Fragment { * Updates the UI. */ private void updateUi() { - View waypointView = getView().findViewById(R.id.marker_detail_waypoint); - View statisticsView = getView().findViewById(R.id.marker_detail_statistics); + boolean hasPhoto = waypoint.hasPhoto(); + photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE); + textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE); + waypointInfo.setVisibility(View.VISIBLE); - boolean isWaypoint = waypoint.getType() == WaypointType.WAYPOINT; - waypointView.setVisibility(isWaypoint ? View.VISIBLE : View.GONE); - statisticsView.setVisibility(isWaypoint ? View.GONE : View.VISIBLE); - - if (isWaypoint) { - boolean hasPhoto = waypoint.hasPhoto(); - photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE); - textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE); - waypointInfo.setVisibility(View.VISIBLE); - - if (hasPhoto) { - handler.removeCallbacks(hideText); - photo.setImageURI(waypoint.getPhotoURI()); - handler.postDelayed(hideText, HIDE_TEXT_DELAY); - } - - setName(R.id.marker_detail_waypoint_name, hasPhoto); - - TextView category = getView().findViewById(R.id.marker_detail_waypoint_category); - ListItemUtils.setTextView(getActivity(), category, StringUtils.getCategory(waypoint.getCategory()), hasPhoto); - - TextView description = getView().findViewById(R.id.marker_detail_waypoint_description); - ListItemUtils.setTextView(getActivity(), description, waypoint.getDescription(), hasPhoto); - - setLocation(R.id.marker_detail_waypoint_location, hasPhoto); - } else { - setName(R.id.marker_detail_statistics_name, false); - - setLocation(R.id.marker_detail_statistics_location, false); - - Track track = contentProviderUtils.getTrack(waypoint.getTrackId()); - StatsUtils.setTripStatisticsValues(getActivity(), waypoint.getTripStatistics(), null); - StatsUtils.setLocationValues(getActivity(), waypoint.getLocation(), false); + if (hasPhoto) { + handler.removeCallbacks(hideText); + photo.setImageURI(waypoint.getPhotoURI()); + handler.postDelayed(hideText, HIDE_TEXT_DELAY); } + + setName(R.id.marker_detail_waypoint_name, hasPhoto); + + TextView category = getView().findViewById(R.id.marker_detail_waypoint_category); + ListItemUtils.setTextView(getActivity(), category, StringUtils.getCategory(waypoint.getCategory()), hasPhoto); + + TextView description = getView().findViewById(R.id.marker_detail_waypoint_description); + ListItemUtils.setTextView(getActivity(), description, waypoint.getDescription(), hasPhoto); + + setLocation(R.id.marker_detail_waypoint_location, hasPhoto); + } private void setName(int resId, boolean addShadow) { diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java index bd84df30b..5cbfed9b4 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java @@ -176,11 +176,6 @@ public class StatsFragment extends Fragment implements TrackDataListener { lastLocation = location; } - @Override - public void onSegmentSplit(Location location) { - // We don't care. - } - @Override public void onNewTrackPointsDone() { if (isResumed()) { diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index b5c73d82b..aed3a0b49 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -56,7 +56,6 @@ import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory; import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor; -import de.dennisguse.opentracks.services.tasks.SplitPeriodicTaskFactory; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.stats.TripStatisticsUpdater; import de.dennisguse.opentracks.util.IntentUtils; @@ -95,7 +94,6 @@ public class TrackRecordingService extends Service { private Handler handler; private LocationManagerConnector locationManagerConnector; private PeriodicTaskExecutor voiceExecutor; - private PeriodicTaskExecutor splitExecutor; private SharedPreferences sharedPreferences; private TrackRecordingServiceNotificationManager notificationManager; private long recordingTrackId; @@ -126,14 +124,10 @@ public class TrackRecordingService extends Service { if (PreferencesUtils.isKey(context, R.string.stats_units_key, key)) { boolean metricUnits = PreferencesUtils.isMetricUnits(context); voiceExecutor.setMetricUnits(metricUnits); - splitExecutor.setMetricUnits(metricUnits); } if (PreferencesUtils.isKey(context, R.string.voice_frequency_key, key)) { voiceExecutor.setTaskFrequency(PreferencesUtils.getVoiceFrequency(context)); } - if (PreferencesUtils.isKey(context, R.string.split_frequency_key, key)) { - splitExecutor.setTaskFrequency(PreferencesUtils.getSplitFrequency(context)); - } if (PreferencesUtils.isKey(context, R.string.min_recording_interval_key, key)) { int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context); if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) { @@ -219,7 +213,6 @@ public class TrackRecordingService extends Service { handler = new Handler(); locationManagerConnector = new LocationManagerConnector(this, handler.getLooper()); voiceExecutor = new PeriodicTaskExecutor(this, new AnnouncementPeriodicTaskFactory()); - splitExecutor = new PeriodicTaskExecutor(this, new SplitPeriodicTaskFactory()); sharedPreferences = PreferencesUtils.getSharedPreferences(this); sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); notificationManager = new TrackRecordingServiceNotificationManager(this); @@ -272,12 +265,6 @@ public class TrackRecordingService extends Service { // unregister sharedPreferences before shutting down splitExecutor and voiceExecutor sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); - try { - splitExecutor.shutdown(); - } finally { - splitExecutor = null; - } - try { voiceExecutor.shutdown(); } finally { @@ -566,7 +553,6 @@ public class TrackRecordingService extends Service { // Restore periodic tasks voiceExecutor.restore(); - splitExecutor.restore(); } /** @@ -653,7 +639,6 @@ public class TrackRecordingService extends Service { private void endRecording(boolean trackStopped, long trackId) { // Shutdown periodic tasks voiceExecutor.shutdown(); - splitExecutor.shutdown(); // Update instance variables if (remoteSensorManager != null) { @@ -840,7 +825,6 @@ public class TrackRecordingService extends Service { Log.w(TAG, "SQLiteException", e); } voiceExecutor.update(); - splitExecutor.update(); } /** diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java deleted file mode 100644 index 12c21844d..000000000 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package de.dennisguse.opentracks.services.tasks; - -import de.dennisguse.opentracks.content.WaypointCreationRequest; -import de.dennisguse.opentracks.services.TrackRecordingService; - -/** - * A simple task to insert statistics markers periodically. - * - * @author Sandor Dornbush - */ -public class SplitPeriodicTask implements PeriodicTask { - - @Override - public void start() { - } - - @Override - public void run(TrackRecordingService trackRecordingService) { - trackRecordingService.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS); - } - - @Override - public void shutdown() { - } -} diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java deleted file mode 100644 index 727d2be9d..000000000 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package de.dennisguse.opentracks.services.tasks; - -import android.content.Context; - -/** - * A {@link PeriodicTaskFactory} for {@link SplitPeriodicTask}. - * - * @author Jimmy Shih - */ -public class SplitPeriodicTaskFactory implements PeriodicTaskFactory { - - @Override - public PeriodicTask create(Context context) { - return new SplitPeriodicTask(); - } -} \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index ad10f8b4f..9d258ac1a 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -167,9 +167,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit ListPreference voiceFrequency = findPreference(getString(R.string.voice_frequency_key)); voiceFrequency.setEntries(StringUtils.getFrequencyOptions(getActivity(), metricUnits)); - ListPreference splitFrequency = findPreference(getString(R.string.split_frequency_key)); - splitFrequency.setEntries(StringUtils.getFrequencyOptions(getActivity(), metricUnits)); - ListPreference minRecordingInterval = findPreference(getString(R.string.min_recording_interval_key)); minRecordingInterval.setEntries(PreferenceHelper.getMinRecordingIntervalEntries(getActivity())); diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java index 633d7d819..20afeb043 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java @@ -304,11 +304,6 @@ public class PreferencesUtils { return PreferencesUtils.getInt(context, R.string.voice_frequency_key, VOICE_FREQUENCY_DEFAULT); } - public static int getSplitFrequency(Context context) { - final int SPLIT_FREQUENCY_DEFAULT = Integer.parseInt(context.getResources().getString(R.string.split_frequency_default)); - return PreferencesUtils.getInt(context, R.string.split_frequency_key, SPLIT_FREQUENCY_DEFAULT); - } - public static int getRecordingDistanceInterval(Context context) { final int RECORDING_DISTANCE_INTERVAL = Integer.parseInt(context.getResources().getString(R.string.recording_distance_interval_default)); return PreferencesUtils.getInt(context, R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefault(context)); diff --git a/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png deleted file mode 100644 index f7160a321..000000000 Binary files a/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png deleted file mode 100644 index 329006a4d..000000000 Binary files a/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png deleted file mode 100644 index 539b90bda..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png and /dev/null differ diff --git a/src/main/res/layout/marker_detail_fragment.xml b/src/main/res/layout/marker_detail_fragment.xml index 733e64d84..93107886d 100644 --- a/src/main/res/layout/marker_detail_fragment.xml +++ b/src/main/res/layout/marker_detail_fragment.xml @@ -18,7 +18,6 @@ limitations under the License. android:layout_height="match_parent"> @@ -69,33 +68,4 @@ limitations under the License. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml index 370adf990..5865cb0d8 100644 --- a/src/main/res/layout/marker_edit.xml +++ b/src/main/res/layout/marker_edit.xml @@ -41,7 +41,7 @@ limitations under the License. diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index c7110e3a4..48c80375f 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -114,28 +114,6 @@ @string/auto_resume_track_timeout_always - splitFrequency - @string/frequency_off - voiceFrequency - @string/frequency_off - 0 - - @string/frequency_off - 1 - 2 - 5 - 10 - 15 - 30 - 60 - -1 - -5 - -10 - -25 - -50 - -100 - - recordingDistanceInterval 10 diff --git a/src/main/res/values/settings_deprecated.xml b/src/main/res/values/settings_deprecated.xml index ad7ae242d..b06987f1d 100644 --- a/src/main/res/values/settings_deprecated.xml +++ b/src/main/res/values/settings_deprecated.xml @@ -15,4 +15,26 @@ @string/settings_chart_by_distance @string/settings_chart_by_time + + splitFrequency + @string/frequency_off + voiceFrequency + @string/frequency_off + 0 + + @string/frequency_off + 1 + 2 + 5 + 10 + 15 + 30 + 60 + -1 + -5 + -10 + -25 + -50 + -100 + \ No newline at end of file diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index a9baae9fe..d4db0dccb 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -80,12 +80,6 @@ limitations under the License. android:key="@string/voice_frequency_key" android:title="@string/menu_voice_frequency" app:useSimpleSummaryProvider="true" /> -