From 8438f7f7b3c35bc4a52a3071d0edd5ef27e237a0 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 20 Jul 2019 19:59:46 +0200 Subject: [PATCH] Renamed settings configuration files. --- .../apps/mytracks/settings/AdvancedSettingsActivity.java | 2 +- .../android/apps/mytracks/settings/ChartSettingsActivity.java | 2 +- .../apps/mytracks/settings/RecordingSettingsActivity.java | 2 +- .../android/apps/mytracks/settings/SensorSettingsActivity.java | 2 +- .../android/apps/mytracks/settings/StatsSettingsActivity.java | 2 +- .../res/xml/{advanced_settings.xml => settings_advanced.xml} | 0 src/main/res/xml/{chart_settings.xml => settings_chart.xml} | 3 +++ .../res/xml/{recording_settings.xml => settings_recording.xml} | 0 src/main/res/xml/{sensor_settings.xml => settings_sensors.xml} | 0 .../res/xml/{stats_settings.xml => settings_statistics.xml} | 0 10 files changed, 8 insertions(+), 5 deletions(-) rename src/main/res/xml/{advanced_settings.xml => settings_advanced.xml} (100%) rename src/main/res/xml/{chart_settings.xml => settings_chart.xml} (97%) rename src/main/res/xml/{recording_settings.xml => settings_recording.xml} (100%) rename src/main/res/xml/{sensor_settings.xml => settings_sensors.xml} (100%) rename src/main/res/xml/{stats_settings.xml => settings_statistics.xml} (100%) diff --git a/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java index 46767ff56..ed7db8472 100644 --- a/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java +++ b/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( diff --git a/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java index fa3cad690..88f0f0fb0 100644 --- a/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java +++ b/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(); } diff --git a/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java index 998a4053d..cca71054d 100644 --- a/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java +++ b/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); diff --git a/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java index 346ca0b90..c5c37aec1 100644 --- a/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java +++ b/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() { diff --git a/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java index b778fba06..4b18fb84c 100644 --- a/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java +++ b/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 diff --git a/src/main/res/xml/advanced_settings.xml b/src/main/res/xml/settings_advanced.xml similarity index 100% rename from src/main/res/xml/advanced_settings.xml rename to src/main/res/xml/settings_advanced.xml diff --git a/src/main/res/xml/chart_settings.xml b/src/main/res/xml/settings_chart.xml similarity index 97% rename from src/main/res/xml/chart_settings.xml rename to src/main/res/xml/settings_chart.xml index 1f4495f26..a5270fc9d 100644 --- a/src/main/res/xml/chart_settings.xml +++ b/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" /> + \ No newline at end of file diff --git a/src/main/res/xml/recording_settings.xml b/src/main/res/xml/settings_recording.xml similarity index 100% rename from src/main/res/xml/recording_settings.xml rename to src/main/res/xml/settings_recording.xml diff --git a/src/main/res/xml/sensor_settings.xml b/src/main/res/xml/settings_sensors.xml similarity index 100% rename from src/main/res/xml/sensor_settings.xml rename to src/main/res/xml/settings_sensors.xml diff --git a/src/main/res/xml/stats_settings.xml b/src/main/res/xml/settings_statistics.xml similarity index 100% rename from src/main/res/xml/stats_settings.xml rename to src/main/res/xml/settings_statistics.xml