Integrated ChartSettingsActivity in SettingsActivity.

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

@@ -1,51 +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.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.PreferenceActivity;
-
-import de.dennisguse.opentracks.util.PreferencesUtils;
-import de.dennisguse.opentracks.R;
-
-/**
- * An activity for accessing chart settings.
- *
- * @author Jimmy Shih
- */
-public class ChartSettingsActivity extends PreferenceActivity {
-
-    @Override
-    protected void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        addPreferencesFromResource(R.xml.settings_chart);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        updateUi();
-    }
-
-    private void updateUi() {
-        CheckBoxPreference speedCheckBoxPreference = (CheckBoxPreference) findPreference(getString(R.string.chart_show_speed_key));
-        speedCheckBoxPreference.setTitle(PreferencesUtils.isReportSpeed(this) ? R.string.stats_speed : R.string.stats_pace);
-    }
-
-}

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

@@ -45,13 +45,15 @@ public class SettingsActivity extends PreferenceActivity {
         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);
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        updateUI();
-                    }
-                });
             }
+
+            //TODO Should only be called if something meaningful happens.
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    updateUI();
+                }
+            });
         }
     };
 
@@ -61,7 +63,6 @@ public class SettingsActivity extends PreferenceActivity {
 
         addPreferencesFromResource(R.xml.settings);
 
-        configPreference(R.string.settings_chart_key, ChartSettingsActivity.class);
         configPreference(R.string.settings_stats_key, StatsSettingsActivity.class);
         configPreference(R.string.settings_recording_key, RecordingSettingsActivity.class);
         configPreference(R.string.settings_sensor_key, SensorSettingsActivity.class);
@@ -103,7 +104,10 @@ public class SettingsActivity extends PreferenceActivity {
         //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.setEnabled(!isRecording);
         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(this) ? R.string.stats_speed : R.string.stats_pace);
     }
 }

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

@@ -250,7 +250,6 @@ public class PreferencesUtils {
 
     public static void resetPreferences(Context context, boolean readAgain) {
         PreferenceManager.setDefaultValues(context, R.xml.settings, readAgain);
-        PreferenceManager.setDefaultValues(context, R.xml.settings_chart, readAgain);
         PreferenceManager.setDefaultValues(context, R.xml.settings_recording, readAgain);
         PreferenceManager.setDefaultValues(context, R.xml.settings_sensors, readAgain);
         PreferenceManager.setDefaultValues(context, R.xml.settings_statistics, readAgain);