Several minor fixes

- for TrackEdit and MarkerEdit, use windowSoftInputMode=stateHidden
- improve layout for the map in MapFragment.
- fix text size for API level < 14.
- fix bug when inserting a statistics marker with a modified name
This commit is contained in:
Jimmy Shih
2012-04-23 14:57:39 -07:00
parent 8f801b1bdb
commit 2ea4b09dcc
11 changed files with 66 additions and 14 deletions
@@ -40,7 +40,7 @@ public class AbstractMyTracksActivity extends FragmentActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() != android.R.id.home) {
return false;
return super.onOptionsItemSelected(item);
}
onHomeSelected();
return true;
@@ -79,6 +79,8 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
boolean statistics = checkedId == R.id.marker_edit_type_statistics;
name.setText(
statistics ? R.string.marker_edit_type_statistics : R.string.marker_edit_type_waypoint);
// Call selectAll so that all EditText have selectAllOnFocus style.
name.selectAll();
updateUiByMarkerType(statistics);
}
});
@@ -365,7 +365,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity {
startActivity(intent);
return true;
default:
return false;
return super.onOptionsItemSelected(item);
}
}
@@ -941,7 +941,7 @@ public class TrackRecordingService extends Service {
buildMarker(wpt, request);
break;
case STATISTICS:
buildStatisticsMarker(wpt);
buildStatisticsMarker(wpt, request);
break;
}
wpt.setTrackId(recordingTrackId);
@@ -987,9 +987,10 @@ public class TrackRecordingService extends Service {
* Build a statistics marker.
* A statistics marker holds the stats for the* last segment up to this marker.
*
* @param waypoint The waypoint which will be populated with stats data.
* @param waypoint The waypoint which will be populated with stats data
* @param request The waypoint creation request
*/
private void buildStatisticsMarker(Waypoint waypoint) {
private void buildStatisticsMarker(Waypoint waypoint, WaypointCreationRequest request) {
DescriptionGenerator descriptionGenerator = new DescriptionGeneratorImpl(this);
// Set stop and total time in the stats data
@@ -1002,7 +1003,8 @@ public class TrackRecordingService extends Service {
// Set the rest of the waypoint data
waypoint.setType(Waypoint.TYPE_STATISTICS);
waypoint.setName(getString(R.string.marker_edit_type_statistics));
waypoint.setName(request.getName() != null ? request.getName()
: getString(R.string.marker_edit_type_statistics));
waypoint.setStatistics(waypointStatsBuilder.getStatistics());
waypoint.setDescription(descriptionGenerator.generateWaypointDescription(waypoint));
waypoint.setIcon(getString(R.string.marker_statistics_icon_url));