diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index 72827f3bf..1e1e5b659 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -174,7 +174,7 @@ public class TrackRecordingServiceTestLooper { @MediumTest @Test public void testWithProperties_metricUnitsDefault() throws TimeoutException { - PreferencesUtils.setString(context, R.string.stats_units_key, PreferencesUtils.STATS_UNITS_DEFAULT); + PreferencesUtils.setString(context, R.string.stats_units_key, context.getString(R.string.stats_units_default)); fullRecordingSession(); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index 3c42e6030..165732451 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -94,7 +94,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA // Preferences private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT; - private boolean showOnLockScreen = PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN; + @Deprecated //TODO Not required to be member variable. + private boolean showOnLockScreen = getResources().getBoolean(R.bool.stats_show_on_lockscreen_while_recording_default); private final Runnable bindChangedCallback = new Runnable() { @Override @@ -134,7 +135,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA } if (PreferencesUtils.isKey(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, key)) { - showOnLockScreen = PreferencesUtils.getBoolean(TrackDetailActivity.this, R.string.stats_show_on_lockscreen_while_recording_key, PreferencesUtils.SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN); + showOnLockScreen = PreferencesUtils.shouldShowStatsOnLockscreen(TrackDetailActivity.this); setLockscreenPolicy(); } diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java index 72c4cad0a..ccd683e58 100644 --- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java @@ -70,10 +70,6 @@ public class PreferencesUtils { public static final int SPLIT_FREQUENCY_DEFAULT = 0; static final boolean STATS_SHOW_ELEVATION_DEFAULT = false; - static final String TRACK_NAME_DEFAULT = "DATE_ISO_8601"; - public static final String STATS_UNITS_DEFAULT = "METRIC"; - - public static final boolean SHOW_TRACKDETAIL_WHILE_RECORDING_ON_LOCKSCREEN = false; // Track widget public static final int VOICE_FREQUENCY_DEFAULT = 0; @@ -264,7 +260,8 @@ public class PreferencesUtils { * @param context the context */ public static boolean isMetricUnits(Context context) { - return STATS_UNITS_DEFAULT.equals(getString(context, R.string.stats_units_key, STATS_UNITS_DEFAULT)); + String statsUnitDefault = context.getString(R.string.stats_units_default); + return statsUnitDefault.equals(getString(context, R.string.stats_units_key, statsUnitDefault)); } /** @@ -274,7 +271,7 @@ public class PreferencesUtils { * @param context the context */ public static boolean isReportSpeed(Context context) { - final String STATS_RATE_DEFAULT = "SPEED"; + final String STATS_RATE_DEFAULT = context.getString(R.string.stats_rate_default); return STATS_RATE_DEFAULT.equals(getString(context, R.string.stats_rate_key, STATS_RATE_DEFAULT)); } @@ -284,10 +281,15 @@ public class PreferencesUtils { * @param context the context */ public static boolean isChartByDistance(Context context) { - final String CHART_X_AXIS_DEFAULT = "DISTANCE"; + final String CHART_X_AXIS_DEFAULT = context.getString(R.string.chart_x_axis_default); return CHART_X_AXIS_DEFAULT.equals(getString(context, R.string.chart_x_axis_key, CHART_X_AXIS_DEFAULT)); } + 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); + } + public static boolean isRecording(Context context) { long recordingTrackId = PreferencesUtils.getRecordingTrackId(context); return recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT; diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java index 9a85fbb5b..eef66640f 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java @@ -47,7 +47,7 @@ public class TrackNameUtils { * @param startTime the track start time */ public static String getTrackName(Context context, long trackId, long startTime) { - String trackName = PreferencesUtils.getString(context, R.string.track_name_key, PreferencesUtils.TRACK_NAME_DEFAULT); + String trackName = PreferencesUtils.getString(context, R.string.track_name_key, context.getString(R.string.track_name_default)); if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) { return StringUtils.formatDateTime(context, startTime); diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml index c4d2544e8..58ad53c49 100644 --- a/src/main/res/values/settings.xml +++ b/src/main/res/values/settings.xml @@ -8,8 +8,12 @@ chartShowSpeed statsShowCoordinate + false + statsShowGradeElevation + trackdetail_show_on_lockscreen_while_recording + false settingsReset @@ -97,6 +101,7 @@ chartXAxis + @string/chart_x_axis_distance @string/chart_x_axis_distance @string/chart_x_axis_time @@ -182,6 +187,7 @@ statsRate + @string/stats_rate_speed @string/description_speed_imperial @string/description_pace_imperial @@ -199,6 +205,7 @@ statsUnits + @string/stats_units_metric @string/stats_units_metric @string/stats_units_imperial @@ -211,6 +218,7 @@ trackName + @string/settings_recording_track_name_date_iso_8601_value DATE_ISO_8601 DATE_LOCAL NUMBER diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml index 3e4cfa2a1..e2ba3131a 100644 --- a/src/main/res/xml/settings.xml +++ b/src/main/res/xml/settings.xml @@ -18,14 +18,14 @@ limitations under the License. @@ -85,7 +85,7 @@ limitations under the License. android:summary="%s" android:title="@string/menu_split_frequency" />