Renamed settings configuration files.

src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java

@@ -79,7 +79,7 @@ public class AdvancedSettingsActivity extends AbstractSettingsActivity {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.advanced_settings);
+    addPreferencesFromResource(R.xml.settings_advanced);
 
     ListPreference preference = (ListPreference) findPreference(getString(R.string.photo_size_key));
     int value = PreferencesUtils.getInt(

src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java

@@ -33,7 +33,7 @@ public class ChartSettingsActivity extends AbstractSettingsActivity {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.chart_settings);
+    addPreferencesFromResource(R.xml.settings_chart);
     configXAxisListPreference();
   }
 

src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java

@@ -43,7 +43,7 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.recording_settings);
+    addPreferencesFromResource(R.xml.settings_recording);
 
     boolean metricUnits = PreferencesUtils.isMetricUnits(this);
 

src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java

@@ -41,7 +41,7 @@ public class SensorSettingsActivity extends AbstractSettingsActivity {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.sensor_settings);
+    addPreferencesFromResource(R.xml.settings_sensors);
 
     findPreference(getString(R.string.settings_sensor_bluetooth_pairing_key))
         .setOnPreferenceClickListener(new OnPreferenceClickListener() {

src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java

@@ -34,7 +34,7 @@ public class StatsSettingsActivity extends AbstractSettingsActivity {
   @Override
   protected void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    addPreferencesFromResource(R.xml.stats_settings);
+    addPreferencesFromResource(R.xml.settings_statistics);
 
     /*
      * Note configureUnitsListPreference will trigger

src/main/res/xml/settings_chart.xml

@@ -32,6 +32,8 @@ limitations under the License.
       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"
@@ -40,5 +42,6 @@ limitations under the License.
       android:defaultValue="true"
       android:key="@string/chart_show_power_key"
       android:title="@string/sensor_state_power" />
+-->
   </PreferenceCategory>
 </PreferenceScreen>