Add a category icon in Track.java and TracksColumns.java.

Clean up Track.java and TracksColumns.java.

MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java

@@ -55,7 +55,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase {
     stats.setMaxGrade(0.42);
     stats.setMinGrade(0.11);
     stats.setStartTime(START_TIME);
-    track.setStatistics(stats);
+    track.setTripStatistics(stats);
     track.setCategory("hiking");
     String expected = "Created by" 
       + " <a href='http://www.google.com/mobile/mytracks'>My Tracks</a> on Android.<p>" 

MyTracksTest/src/com/google/android/apps/mytracks/content/SearchEngineTest.java

@@ -77,7 +77,7 @@ public class SearchEngineTest extends AndroidTestCase {
     track.setDescription(description);
     track.setCategory(category);
 
-    TripStatistics stats = track.getStatistics();
+    TripStatistics stats = track.getTripStatistics();
     if (hoursAgo > 0) {
       // Started twice hoursAgo, so the average time is hoursAgo.
       stats.setStartTime(NOW - hoursAgo * 1000L * 60L * 60L * 2);

MyTracksTest/src/com/google/android/apps/mytracks/io/docs/SendDocsUtilsTest.java

@@ -180,7 +180,7 @@ public class SendDocsUtilsTest extends AndroidTestCase {
     track.setName("trackName");
     track.setDescription("trackDescription");
     track.setMapId("trackMapId");
-    track.setStatistics(stats);
+    track.setTripStatistics(stats);
     return track;
   }
 

MyTracksTest/src/com/google/android/apps/mytracks/io/file/GpxImporterTest.java

@@ -19,10 +19,9 @@ import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
-import com.google.android.apps.mytracks.io.file.GpxImporter;
 import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
@@ -171,7 +170,7 @@ public class GpxImporterTest extends AndroidTestCase {
     Track track = trackParam.getValue();
     assertEquals(TRACK_NAME, track.getName());
     assertEquals(TRACK_DESC, track.getDescription());
-    assertEquals(DATE_FORMAT2.parse(TRACK_TIME_1).getTime(), track.getStatistics()
+    assertEquals(DATE_FORMAT2.parse(TRACK_TIME_1).getTime(), track.getTripStatistics()
         .getStartTime());
     assertNotSame(-1, track.getStartId());
     assertNotSame(-1, track.getStopId());

MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtilsTest.java

@@ -47,7 +47,7 @@ public class SendFusionTablesUtilsTest extends TestCase {
     Track track = new Track();
     TripStatistics stats = new TripStatistics();
     stats.setBounds((int) 100.E6, (int) 10.E6, (int) 50.E6, (int) 5.E6);
-    track.setStatistics(stats);
+    track.setTripStatistics(stats);
     track.setTableId(null);
     assertEquals(null, SendFusionTablesUtils.getMapUrl(track));
   }
@@ -57,7 +57,7 @@ public class SendFusionTablesUtilsTest extends TestCase {
    */
   public void testGetMapUrl_null_stats() {
     Track track = new Track();
-    track.setStatistics(null);
+    track.setTripStatistics(null);
     track.setTableId("123");
     assertEquals(null, SendFusionTablesUtils.getMapUrl(track));
   }
@@ -69,7 +69,7 @@ public class SendFusionTablesUtilsTest extends TestCase {
     Track track = new Track();
     TripStatistics stats = new TripStatistics();
     stats.setBounds((int) 100.E6, (int) 10.E6, (int) 50.E6, (int) 5.E6);
-    track.setStatistics(stats);
+    track.setTripStatistics(stats);
     track.setTableId("123");
     assertEquals(
         "https://www.google.com/fusiontables/embedviz?"

MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendToGoogleUtilsTest.java

@@ -56,13 +56,14 @@ public class SendToGoogleUtilsTest extends TestCase {
    */
   public void testPrepareTrackSegment_noStopTime() {
     Track trackStub = TrackStubUtils.createTrack(2);
-    assertEquals(-1L, trackStub.getStatistics().getStopTime());
+    assertEquals(-1L, trackStub.getTripStatistics().getStopTime());
 
     ArrayList<Track> tracksArray = new ArrayList<Track>();
     assertTrue(SendToGoogleUtils.prepareTrackSegment(trackStub, tracksArray));
     assertEquals(trackStub, tracksArray.get(0));
     // The stop time should be the time of last location
-    assertEquals(trackStub.getLocations().get(1).getTime(), trackStub.getStatistics().getStopTime());
+    assertEquals(
+        trackStub.getLocations().get(1).getTime(), trackStub.getTripStatistics().getStopTime());
   }
 
   /**
@@ -75,12 +76,12 @@ public class SendToGoogleUtilsTest extends TestCase {
     // Gives a margin to make sure the this time will be not same with the last
     // location in the track.
     long stopTime = System.currentTimeMillis() + 1000;
-    trackStub.getStatistics().setStopTime(stopTime);
+    trackStub.getTripStatistics().setStopTime(stopTime);
 
     ArrayList<Track> tracksArray = new ArrayList<Track>();
     SendToGoogleUtils.prepareTrackSegment(trackStub, tracksArray);
     assertEquals(trackStub, tracksArray.get(0));
-    assertEquals(stopTime, trackStub.getStatistics().getStopTime());
+    assertEquals(stopTime, trackStub.getTripStatistics().getStopTime());
   }
 
   /**

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -676,7 +676,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     dummyTrack.setName("Dummy Track");
     TripStatistics tripStatistics = new TripStatistics();
     tripStatistics.setStopTime(stopTime);
-    dummyTrack.setStatistics(tripStatistics);
+    dummyTrack.setTripStatistics(tripStatistics);
     addTrack(dummyTrack, isRecording);
     return dummyTrack;
   }
@@ -740,7 +740,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
     track = providerUtils.getTrack(id);
     assertNotNull(track);
     assertEquals(id, track.getId());
-    TripStatistics tripStatistics = track.getStatistics();
+    TripStatistics tripStatistics = track.getTripStatistics();
     assertNotNull(tripStatistics);
     assertTrue(tripStatistics.getStartTime() > 0);
     assertTrue(tripStatistics.getStopTime() >= tripStatistics.getStartTime());

MyTracksTest/src/com/google/android/apps/mytracks/util/ChartURLGeneratorTest.java

@@ -33,7 +33,7 @@ public class ChartURLGeneratorTest extends TestCase {
     Vector<Double> distances = new Vector<Double>();
     Vector<Double> elevations = new Vector<Double>();
     Track t = new Track();
-    TripStatistics stats = t.getStatistics();
+    TripStatistics stats = t.getTripStatistics();
     stats.setMinElevation(0);
     stats.setMaxElevation(2000);
     stats.setTotalDistance(100);