karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fixing clearing of stats at the start of recording.

Browse Source
This commit is contained in:
Rodrigo Damazio
2011-05-04 21:45:23 -03:00
parent 962374b765
commit 520c3659d2
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
+3 -1
View File
@@ -83,6 +83,8 @@ public class StatsUtilities {
public void setText(int id, double d, NumberFormat format) { public void setText(int id, double d, NumberFormat format) {
if (!Double.isNaN(d) && !Double.isInfinite(d)) { if (!Double.isNaN(d) && !Double.isInfinite(d)) {
setText(id, format.format(d)); setText(id, format.format(d));
} else {
setUnknown(id);
} }
} }
@@ -218,7 +220,7 @@ public class StatsUtilities {
setGrade(R.id.max_grade_register, maxGrade); setGrade(R.id.max_grade_register, maxGrade);
} }
public void setAllStats(TripStatistics stats) { public void setAllStats(TripStatistics stats) {
setTime(R.id.moving_time_register, stats.getMovingTime()); setTime(R.id.moving_time_register, stats.getMovingTime());
setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000); setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000);
setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * 3.6); setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * 3.6);
MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+4 -7
View File
@@ -176,7 +176,6 @@ public class TrackDataHub {
// Transient state about the selected track // Transient state about the selected track
private long selectedTrackId; private long selectedTrackId;
private long recordingTrackId;
private long firstSeenLocationId; private long firstSeenLocationId;
private long lastSeenLocationId; private long lastSeenLocationId;
private int numLoadedPoints; private int numLoadedPoints;
@@ -239,7 +238,6 @@ public class TrackDataHub {
private void loadSharedPreferences() { private void loadSharedPreferences() {
selectedTrackId = preferences.getLong(SELECTED_TRACK_KEY, -1); selectedTrackId = preferences.getLong(SELECTED_TRACK_KEY, -1);
recordingTrackId = preferences.getLong(RECORDING_TRACK_KEY, -1);
useMetricUnits = preferences.getBoolean(METRIC_UNITS_KEY, true); useMetricUnits = preferences.getBoolean(METRIC_UNITS_KEY, true);
reportSpeed = preferences.getBoolean(SPEED_REPORTING_KEY, true); reportSpeed = preferences.getBoolean(SPEED_REPORTING_KEY, true);
minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY, minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY,
@@ -340,7 +338,7 @@ public class TrackDataHub {
if (!started) { if (!started) {
loadSharedPreferences(); loadSharedPreferences();
} }
return recordingTrackId > 0; return preferences.getLong(RECORDING_TRACK_KEY, -1) > 0;
} }
/** Returns whether the selected track is still being recorded. */ /** Returns whether the selected track is still being recorded. */
@@ -348,7 +346,8 @@ public class TrackDataHub {
if (!started) { if (!started) {
loadSharedPreferences(); loadSharedPreferences();
} }
return recordingTrackId > 0 && recordingTrackId == selectedTrackId; long recordingTrackId = preferences.getLong(RECORDING_TRACK_KEY, -1);
return recordingTrackId > 0 && recordingTrackId == selectedTrackId;
} }
/** /**
@@ -549,9 +548,7 @@ public class TrackDataHub {
* @param key the key to the preference that changed * @param key the key to the preference that changed
*/ */
private void notifyPreferenceChanged(String key) { private void notifyPreferenceChanged(String key) {
if (RECORDING_TRACK_KEY.equals(key)) { if (MIN_REQUIRED_ACCURACY_KEY.equals(key)) {
recordingTrackId = preferences.getLong(RECORDING_TRACK_KEY, -1);
} else if (MIN_REQUIRED_ACCURACY_KEY.equals(key)) {
minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY, minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY,
Constants.DEFAULT_MIN_REQUIRED_ACCURACY); Constants.DEFAULT_MIN_REQUIRED_ACCURACY);
} else if (METRIC_UNITS_KEY.equals(key)) { } else if (METRIC_UNITS_KEY.equals(key)) {