diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
index 9ee521f7a..ed5b6a19e 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
@@ -257,9 +257,8 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
}
reportSpeed = speed;
chartView.setReportSpeed(reportSpeed);
- boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
- setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed);
- setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed);
+ setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed);
+ setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed);
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -296,26 +295,14 @@ public abstract class ChartFragment extends Fragment implements TrackDataListene
*/
private void checkChartSettings() {
boolean needUpdate = false;
- if (setSeriesEnabled(ChartView.ELEVATION_SERIES, PreferencesUtils.shouldChartShowElevation(getActivity()))) {
+
+ if (setSeriesEnabled(ChartView.SPEED_SERIES, reportSpeed)) {
+ needUpdate = true;
+ }
+ if (setSeriesEnabled(ChartView.PACE_SERIES, !reportSpeed)) {
needUpdate = true;
}
- boolean chartShowSpeed = PreferencesUtils.shouldChartShowSpeed(getActivity());
- if (setSeriesEnabled(ChartView.SPEED_SERIES, chartShowSpeed && reportSpeed)) {
- needUpdate = true;
- }
- if (setSeriesEnabled(ChartView.PACE_SERIES, chartShowSpeed && !reportSpeed)) {
- needUpdate = true;
- }
- if (setSeriesEnabled(ChartView.POWER_SERIES, PreferencesUtils.shouldChartShowPower(getActivity()))) {
- needUpdate = true;
- }
- if (setSeriesEnabled(ChartView.CADENCE_SERIES, PreferencesUtils.shouldChartShowCadence(getActivity()))) {
- needUpdate = true;
- }
- if (setSeriesEnabled(ChartView.HEART_RATE_SERIES, PreferencesUtils.shouldChartShowHeartRate(getActivity()))) {
- needUpdate = true;
- }
if (needUpdate) {
chartView.postInvalidate();
}
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 9d258ac1a..2ed749111 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -73,14 +73,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
}
});
}
- if (PreferencesUtils.isKey(getActivity(), R.string.stats_rate_key, key)) {
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- updateSpeed();
- }
- });
- }
}
};
@@ -104,7 +96,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
public void onResume() {
super.onResume();
PreferencesUtils.getSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
- updateSpeed();
updateUnits();
updateReset();
updateBluetooth();
@@ -150,11 +141,6 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
resetPreference.setEnabled(!isRecording);
}
- private void updateSpeed() {
- Preference speedCheckBoxPreference = findPreference(getString(R.string.chart_show_speed_key));
- speedCheckBoxPreference.setTitle(PreferencesUtils.isReportSpeed(getActivity()) ? R.string.stats_speed : R.string.stats_pace);
- }
-
private void updateBluetooth() {
// Disable Bluetooth preference if device does not have Bluetooth
BluetoothLePreference bluetoothPreference = findPreference(getString(R.string.settings_sensor_bluetooth_heart_rate_key));
diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index 982d492ca..2f5c3c9a8 100644
--- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -265,31 +265,6 @@ public class PreferencesUtils {
return PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_heart_rate_key, getBluetoothHeartRateSensorAddressNone(context));
}
- public static boolean shouldChartShowCadence(Context context) {
- final boolean CHART_SHOW_CADENCE = context.getResources().getBoolean(R.bool.chart_show_cadence_default);
- return PreferencesUtils.getBoolean(context, R.string.chart_show_cadence_key, CHART_SHOW_CADENCE);
- }
-
- public static boolean shouldChartShowElevation(Context context) {
- final boolean CHART_SHOW_ELEVATION = context.getResources().getBoolean(R.bool.chart_show_elevation_default);
- return PreferencesUtils.getBoolean(context, R.string.chart_show_elevation_key, CHART_SHOW_ELEVATION);
- }
-
- public static boolean shouldChartShowHeartRate(Context context) {
- final boolean CHART_SHOW_HEARTRATE = context.getResources().getBoolean(R.bool.chart_show_heart_rate_default);
- return PreferencesUtils.getBoolean(context, R.string.chart_show_heart_rate_key, CHART_SHOW_HEARTRATE);
- }
-
- public static boolean shouldChartShowPower(Context context) {
- final boolean CHART_SHOW_POWER = context.getResources().getBoolean(R.bool.chart_show_power_default);
- return PreferencesUtils.getBoolean(context, R.string.chart_show_power_key, CHART_SHOW_POWER);
- }
-
- public static boolean shouldChartShowSpeed(Context context) {
- final boolean CHART_SHOW_SPEED = context.getResources().getBoolean(R.bool.chart_show_speed_default);
- return PreferencesUtils.getBoolean(context, R.string.chart_show_speed_key, CHART_SHOW_SPEED);
- }
-
public static boolean shouldShowStatsOnLockscreen(Context context) {
final boolean STATS_SHOW_ON_LOCKSCREEN_DEFAULT = context.getResources().getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default);
return getBoolean(context, R.string.stats_show_on_lockscreen_while_recording_key, STATS_SHOW_ON_LOCKSCREEN_DEFAULT);
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 3888ae9e1..783b49575 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -1,21 +1,6 @@
- chartShowCadence
- true
-
- chartShowElevation
- true
-
- chartShowHeartRate
- true
-
- chartShowPower
- true
-
- chartShowSpeed
- true
-
statsShowCoordinate
false
diff --git a/src/main/res/values/settings_deprecated.xml b/src/main/res/values/settings_deprecated.xml
index 8b51602cb..f807544fd 100644
--- a/src/main/res/values/settings_deprecated.xml
+++ b/src/main/res/values/settings_deprecated.xml
@@ -37,4 +37,19 @@
- -50
- -100
+
+ chartShowCadence
+ true
+
+ chartShowElevation
+ true
+
+ chartShowHeartRate
+ true
+
+ chartShowPower
+ true
+
+ chartShowSpeed
+ true
\ No newline at end of file
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 3ba34b93c..71da7e35f 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -53,21 +53,6 @@ limitations under the License.
android:title="@string/settings_stats_coordinate" />
-
-
-
-
-
-
-