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

Merge heads

Browse Source
This commit is contained in:
youtaol
2012-06-05 16:51:53 +08:00
parent 953bd8b908
commit 04cc524bbb
131 changed files with 4865 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class ChartView extends View {
private static final int Y_AXIS_OFFSET = 16;
// Marker pin x position / marker icon width
private static final double MARKER_PIN_X_POSITION_PERCENTAGE = (double) 10 / 32;
private static final double MARKER_PIN_X_POSITION_PERCENTAGE = 13 / 48.0;
private final ChartValueSeries[] series = new ChartValueSeries[NUM_SERIES];
private final ArrayList<double[]> chartData = new ArrayList<double[]>();
MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+2 -1
View File
@@ -79,7 +79,8 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity {
statisticsSection.setVisibility(View.GONE);
TextView markerType = (TextView) findViewById(R.id.marker_detail_waypoint_marker_type);
markerType.setText(getString(R.string.marker_detail_marker_type, waypoint.getCategory()));
markerType.setText(getString(
R.string.marker_detail_waypoint_marker_type, waypoint.getCategory()));
TextView description = (TextView) findViewById(R.id.marker_detail_waypoint_description);
description.setText(getString(R.string.generic_description_line, waypoint.getDescription()));
} else {
MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java
+4 -3
View File
@@ -116,9 +116,10 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
waypointSection.setVisibility(View.VISIBLE);
int nextMarkerNumber = trackId == -1L ? -1
: MyTracksProviderUtils.Factory.get(this).getNextMarkerNumber(trackId, false);
String name = nextMarkerNumber == -1 ? getString(R.string.marker_type_waypoint)
: getString(R.string.marker_name_format, nextMarkerNumber);
waypointName.setText(name);
if (nextMarkerNumber == -1) {
nextMarkerNumber = 0;
}
waypointName.setText(getString(R.string.marker_name_format, nextMarkerNumber));
waypointName.selectAll();
waypointMarkerType.setText("");
waypointDescription.setText("");
MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+1 -1
View File
@@ -275,7 +275,7 @@ public class MapFragment extends Fragment
break;
case NO_FIX:
case BAD_FIX:
messageId = R.string.gps_wait_for_fix;
messageId = R.string.gps_wait_for_signal;
isGpsDisabled = false;
break;
case GOOD_FIX:
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+8 -4
View File
@@ -960,8 +960,10 @@ public class TrackRecordingService extends Service {
name = request.getName();
} else {
int nextMarkerNumber = providerUtils.getNextMarkerNumber(recordingTrackId, false);
name = nextMarkerNumber == -1 ? getString(R.string.marker_type_waypoint)
: getString(R.string.marker_name_format, nextMarkerNumber);
if (nextMarkerNumber == -1) {
nextMarkerNumber = 0;
}
name = getString(R.string.marker_name_format, nextMarkerNumber);
}
wpt.setName(name);
if (request.getCategory() != null) {
@@ -997,8 +999,10 @@ public class TrackRecordingService extends Service {
name = request.getName();
} else {
int nextMarkerNumber = providerUtils.getNextMarkerNumber(recordingTrackId, true);
name = nextMarkerNumber == -1 ? getString(R.string.marker_type_statistics)
: getString(R.string.marker_split_name_format, nextMarkerNumber);
if (nextMarkerNumber == -1) {
nextMarkerNumber = 0;
}
name = getString(R.string.marker_split_name_format, nextMarkerNumber);
}
waypoint.setName(name);
waypoint.setStatistics(waypointStatsBuilder.getStatistics());