Merge to head

2012-01-02 19:03:07 -02:00
parent 1bd6e53f04
commit c3912042e9
125 changed files with 1852 additions and 3675 deletions
@@ -420,9 +420,8 @@ public class MapActivity extends com.google.android.maps.MapActivity
            Constants.getActionFromMenuId(item.getItemId()));
        return true;
      case Constants.MENU_EDIT: {
-        Intent intent = new Intent(this, TrackDetails.class);
-        // TODO: Pass in a content URI
-        intent.putExtra("trackid", dataHub.getSelectedTrackId());
+        Intent intent = new Intent(this, TrackDetail.class);
+        intent.putExtra(TrackDetail.TRACK_ID, dataHub.getSelectedTrackId());
        startActivity(intent);
        return true;
      }