diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java index ebe6700a2..5765ed2ef 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java @@ -103,7 +103,7 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv * @param trackId the track id */ protected void shareTrack(long trackId) { - AnalyticsUtils.sendPageViews(this, "/action/share_drive"); + AnalyticsUtils.sendPageViews(this, AnalyticsUtils.ACTION_SHARE_DRIVE); SendRequest newRequest; newRequest = new SendRequest(trackId); newRequest.setSendDrive(true); @@ -365,6 +365,7 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv * @param trackIds the track ids */ protected void confirmPlay(long[] trackIds) { + AnalyticsUtils.sendPageViews(this, AnalyticsUtils.ACTION_PLAY); if (GoogleEarthUtils.isEarthInstalled(this)) { if (PreferencesUtils.getBoolean( this, R.string.confirm_play_earth_key, PreferencesUtils.CONFIRM_PLAY_EARTH_DEFAULT)) { @@ -381,12 +382,11 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv @Override public void onConfirmPlayDone(long[] trackIds) { - AnalyticsUtils.sendPageViews(this, "/action/play"); - Intent intent = IntentUtils.newIntent(this, SaveActivity.class) - .putExtra(SaveActivity.EXTRA_TRACK_IDS, trackIds) - .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) TrackFileFormat.KML) - .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true); - startActivity(intent); + Intent intent = IntentUtils.newIntent(this, SaveActivity.class) + .putExtra(SaveActivity.EXTRA_TRACK_IDS, trackIds) + .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) TrackFileFormat.KML) + .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true); + startActivity(intent); } protected void deleteTrack(long[] trackIds) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index da20f5e05..3bbf04363 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -58,8 +58,6 @@ import android.view.View.OnClickListener; import android.widget.TabHost; import android.widget.TabHost.TabSpec; -import java.util.Locale; - /** * An activity to show the track detail. * @@ -151,13 +149,13 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements public void onClick(View v) { if (recordingTrackPaused) { // Paused -> Resume - AnalyticsUtils.sendPageViews(TrackDetailActivity.this, "/action/resume_track"); + AnalyticsUtils.sendPageViews(TrackDetailActivity.this, AnalyticsUtils.ACTION_RESUME_TRACK); updateMenuItems(true, false); TrackRecordingServiceConnectionUtils.resumeTrack(trackRecordingServiceConnection); trackController.update(true, false); } else { // Recording -> Paused - AnalyticsUtils.sendPageViews(TrackDetailActivity.this, "/action/pause_track"); + AnalyticsUtils.sendPageViews(TrackDetailActivity.this, AnalyticsUtils.ACTION_PAUSE_TRACK); updateMenuItems(true, true); TrackRecordingServiceConnectionUtils.pauseTrack(trackRecordingServiceConnection); trackController.update(true, true); @@ -168,7 +166,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements private final OnClickListener stopListener = new OnClickListener() { @Override public void onClick(View v) { - AnalyticsUtils.sendPageViews(TrackDetailActivity.this, "/action/stop_recording"); + AnalyticsUtils.sendPageViews(TrackDetailActivity.this, AnalyticsUtils.ACTION_STOP_RECORDING); updateMenuItems(false, true); TrackRecordingServiceConnectionUtils.stopRecording( TrackDetailActivity.this, trackRecordingServiceConnection, true); @@ -228,7 +226,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements TrackRecordingServiceConnectionUtils.startConnection(this, trackRecordingServiceConnection); trackDataHub.start(); - AnalyticsUtils.sendPageViews(this, "/page/track_detail"); + AnalyticsUtils.sendPageViews(this, AnalyticsUtils.PAGE_TRACK_DETAIL); } @Override @@ -329,7 +327,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements Intent intent; switch (item.getItemId()) { case R.id.track_detail_insert_marker: - AnalyticsUtils.sendPageViews(this, "/action/insert_marker"); + AnalyticsUtils.sendPageViews(this, AnalyticsUtils.ACTION_INSERT_MARKER); intent = IntentUtils.newIntent(this, MarkerEditActivity.class) .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId); startActivity(intent); @@ -356,7 +354,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG); return true; case R.id.track_detail_export: - AnalyticsUtils.sendPageViews(this, "/export"); new ExportDialogFragment().show(getSupportFragmentManager(), ExportDialogFragment.EXPORT_DIALOG_TAG); return true; @@ -403,27 +400,27 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements @Override public void onExportDone(ExportType exportType, TrackFileFormat trackFileFormat) { - String pageView; if (exportType == ExportType.EXTERNAL_STORAGE) { - pageView = "/export/external_storage_" + trackFileFormat.name().toLowerCase(Locale.US); - AnalyticsUtils.sendPageViews(this, pageView); + AnalyticsUtils.sendPageViews(this, + AnalyticsUtils.ACTION_EXPORT_PREFIX + trackFileFormat.getExtension()); Intent intent = IntentUtils.newIntent(this, SaveActivity.class) .putExtra(SaveActivity.EXTRA_TRACK_IDS, new long[] { trackId }) .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat); startActivity(intent); } else { SendRequest sendRequest = new SendRequest(trackId); + String pageView; switch (exportType) { case GOOGLE_MAPS: - pageView = "/export/maps"; + pageView = AnalyticsUtils.ACTION_EXPORT_MAPS; sendRequest.setSendMaps(true); break; case GOOGLE_FUSION_TABLES: - pageView = "/export/fusion_tables"; + pageView = AnalyticsUtils.ACTION_EXPORT_FUSION_TABLES; sendRequest.setSendFusionTables(true); break; default: - pageView = "/export/spreadsheets"; + pageView = AnalyticsUtils.ACTION_EXPORT_SPREADSHEETS; sendRequest.setSendSpreadsheets(true); } AnalyticsUtils.sendPageViews(this, pageView); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index dbbe54ef3..7fd070308 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java @@ -84,8 +84,6 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import android.widget.Toast; -import java.util.Locale; - /** * An activity displaying a list of tracks. * @@ -242,19 +240,19 @@ public class TrackListActivity extends AbstractSendToGoogleActivity public void onClick(View v) { if (recordingTrackId == PreferencesUtils.RECORDING_TRACK_ID_DEFAULT) { // Not recording -> Recording - AnalyticsUtils.sendPageViews(TrackListActivity.this, "/action/record_track"); + AnalyticsUtils.sendPageViews(TrackListActivity.this, AnalyticsUtils.ACTION_RECORD_TRACK); updateMenuItems(false, true); startRecording(); } else { if (recordingTrackPaused) { // Paused -> Resume - AnalyticsUtils.sendPageViews(TrackListActivity.this, "/action/resume_track"); + AnalyticsUtils.sendPageViews(TrackListActivity.this, AnalyticsUtils.ACTION_RESUME_TRACK); updateMenuItems(false, true); TrackRecordingServiceConnectionUtils.resumeTrack(trackRecordingServiceConnection); trackController.update(true, false); } else { // Recording -> Paused - AnalyticsUtils.sendPageViews(TrackListActivity.this, "/action/pause_track"); + AnalyticsUtils.sendPageViews(TrackListActivity.this, AnalyticsUtils.ACTION_PAUSE_TRACK); updateMenuItems(false, true); TrackRecordingServiceConnectionUtils.pauseTrack(trackRecordingServiceConnection); trackController.update(true, true); @@ -266,7 +264,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity private final OnClickListener stopListener = new OnClickListener() { @Override public void onClick(View v) { - AnalyticsUtils.sendPageViews(TrackListActivity.this, "/action/stop_recording"); + AnalyticsUtils.sendPageViews(TrackListActivity.this, AnalyticsUtils.ACTION_STOP_RECORDING); updateMenuItems(false, false); TrackRecordingServiceConnectionUtils.stopRecording( TrackListActivity.this, trackRecordingServiceConnection, true); @@ -406,7 +404,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity // Update track recording service connection TrackRecordingServiceConnectionUtils.startConnection(this, trackRecordingServiceConnection); - AnalyticsUtils.sendPageViews(this, "/page/track_list"); + AnalyticsUtils.sendPageViews(this, AnalyticsUtils.PAGE_TRACK_LIST); } @Override @@ -625,7 +623,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity switch (menuId) { case R.id.track_list_export_all: AnalyticsUtils.sendPageViews( - this, "/action/save_all_" + trackFileFormat.name().toLowerCase(Locale.US)); + this, AnalyticsUtils.ACTION_EXPORT_ALL_PREFIX + trackFileFormat.getExtension()); intent = IntentUtils.newIntent(this, SaveActivity.class) .putExtra(SaveActivity.EXTRA_TRACK_IDS, new long[] {-1L}) .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat); @@ -633,7 +631,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity break; case R.id.track_list_import_all: AnalyticsUtils.sendPageViews( - this, "/action/import_all_" + trackFileFormat.name().toLowerCase(Locale.US)); + this, AnalyticsUtils.ACTION_IMPORT_ALL_PREFIX + trackFileFormat.getExtension()); intent = IntentUtils.newIntent(this, ImportActivity.class) .putExtra(ImportActivity.EXTRA_IMPORT_ALL, true) .putExtra(ImportActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat); diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java index aaf318451..ecedd7465 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java @@ -98,17 +98,17 @@ public class SensorManagerFactory { if (sensorType.equals(context.getString(R.string.sensor_type_value_ant))) { if (sendPageViews) { - AnalyticsUtils.sendPageViews(context, "/sensor/ant"); + AnalyticsUtils.sendPageViews(context, AnalyticsUtils.SENSOR_ANT); } return new AntSensorManager(context); } else if (sensorType.equals(context.getString(R.string.sensor_type_value_zephyr))) { if (sendPageViews) { - AnalyticsUtils.sendPageViews(context, "/sensor/zephyr"); + AnalyticsUtils.sendPageViews(context, AnalyticsUtils.SENSOR_ZEPHYR); } return new ZephyrSensorManager(context); } else if (sensorType.equals(context.getString(R.string.sensor_type_value_polar))) { if (sendPageViews) { - AnalyticsUtils.sendPageViews(context, "/sensor/polar"); + AnalyticsUtils.sendPageViews(context, AnalyticsUtils.SENSOR_POLAR); } return new PolarSensorManager(context); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/AnalyticsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/AnalyticsUtils.java index 3c5469117..f40424580 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/AnalyticsUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/AnalyticsUtils.java @@ -27,6 +27,27 @@ import android.content.Context; */ public class AnalyticsUtils { + public static final String ACTION_EXPORT_ALL_PREFIX = "/action/export_all_"; + public static final String ACTION_EXPORT_PREFIX = "/action/export_"; + public static final String ACTION_EXPORT_FUSION_TABLES = "/action/export_fusion_tables"; + public static final String ACTION_EXPORT_MAPS = "/action/export_maps"; + public static final String ACTION_EXPORT_SPREADSHEETS = "/action/export_spreadsheets"; + public static final String ACTION_IMPORT_ALL_PREFIX = "/action/import_all_"; + public static final String ACTION_INSERT_MARKER = "/action/insert_marker"; + public static final String ACTION_PAUSE_TRACK = "/action/pause_track"; + public static final String ACTION_PLAY = "/action/play"; + public static final String ACTION_RECORD_TRACK = "/action/record_track"; + public static final String ACTION_RESUME_TRACK = "/action/resume_track"; + public static final String ACTION_SHARE_DRIVE = "/action/share_drive"; + public static final String ACTION_STOP_RECORDING = "/action/stop_recording"; + + public static final String PAGE_TRACK_DETAIL = "/page/track_detail"; + public static final String PAGE_TRACK_LIST = "/page/track_list"; + + public static final String SENSOR_ANT = "/sensor/ant"; + public static final String SENSOR_POLAR = "/sensor/polar"; + public static final String SENSOR_ZEPHYR = "/sensor/zephyr"; + private static final String UA = "UA-7222692-2"; private static final String PRODUCT_NAME = "android-mytracks"; private static GoogleAnalyticsTracker tracker; @@ -53,4 +74,4 @@ public class AnalyticsUtils { tracker.dispatch(); } } -} +} \ No newline at end of file