Merge to head (non-trivial merge)

MyTracks/src/com/google/android/apps/mytracks/MyTracks.java

@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
+import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.TracksColumns;
@@ -79,6 +80,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
    */
   private MyTracksProviderUtils providerUtils;
 
+  /**
+   * Google Analytics tracker
+   */
+  private GoogleAnalyticsTracker tracker;
+
   private TrackRecordingServiceBinder serviceBinder;
 
   /*
@@ -125,6 +131,13 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       apiFeatures.getApiPlatformAdapter().enableStrictMode();
     }
 
+    tracker = GoogleAnalyticsTracker.getInstance();
+    // Start the tracker in manual dispatch mode...
+    tracker.start(getString(R.string.google_analytics_id), getApplicationContext());
+    tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this));
+    tracker.trackPageView("/appstart");
+    tracker.dispatch();
+
     providerUtils = MyTracksProviderUtils.Factory.get(this);
     preferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
     dataHub = TrackDataHub.newInstance(this);
@@ -179,6 +192,9 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
     dataHub.stop();
 
+    tracker.dispatch();
+    tracker.stop();
+
     // Clean up any temporary track files.
     TempFileCleaner.clean();
     super.onStop();
@@ -464,10 +480,10 @@ public class MyTracks extends TabActivity implements OnTouchListener {
         startActivity(intent);
       }
     }
-
     serviceBinder.stopService();
   }
 
+
   void clearSelectedTrack() {
     dataHub.unloadCurrentTrack();
   }