Rename MyTracks.java to TrackDetailActivity.java

MyTracks/AndroidManifest.xml

@@ -192,7 +192,7 @@ limitations under the License.
     </activity>
     <activity
       android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
-      android:name="com.google.android.apps.mytracks.MyTracks" >
+      android:name="com.google.android.apps.mytracks.TrackDetailActivity" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 

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

@@ -32,11 +32,11 @@ import android.view.MenuItem;
  */
 class MenuManager {
 
-  private final MyTracks activity;
+  private final TrackDetailActivity activity;
   private MenuItem recordTrack;
   private MenuItem stopRecording;
   
-  public MenuManager(MyTracks activity) {
+  public MenuManager(TrackDetailActivity activity) {
     this.activity = activity;
   }
 

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

@@ -68,7 +68,7 @@ import android.widget.Toast;
  * @author Rodrigo Damazio
  */
 @SuppressWarnings("deprecation")
-public class MyTracks extends TabActivity implements OnTouchListener {
+public class TrackDetailActivity extends TabActivity implements OnTouchListener {
   private static final int DIALOG_EULA_ID = 0;
   private static final int DIALOG_CHECK_UNITS_ID = 1;
   private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits";
@@ -283,9 +283,9 @@ public class MyTracks extends TabActivity implements OnTouchListener {
             .setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which) {
-                EulaUtils.setEulaValue(MyTracks.this);
+                EulaUtils.setEulaValue(TrackDetailActivity.this);
                 startActivityForResult(
-                    new Intent(MyTracks.this, WelcomeActivity.class), Constants.WELCOME);
+                    new Intent(TrackDetailActivity.this, WelcomeActivity.class), Constants.WELCOME);
               }
             })
             .setTitle(R.string.eula_title)
@@ -523,7 +523,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     serviceConnection.stop();
 
     if (currentTrackId > 0) {
-      Intent intent = new Intent(MyTracks.this, TrackEditActivity.class)
+      Intent intent = new Intent(this, TrackEditActivity.class)
           .putExtra(TrackEditActivity.SHOW_CANCEL, false)
           .putExtra(TrackEditActivity.TRACK_ID, currentTrackId);
       startActivity(intent);

MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java

@@ -16,7 +16,7 @@
 
 package com.google.android.apps.mytracks.io.backup;
 
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.util.DialogUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -92,7 +92,8 @@ public class RestoreActivity extends Activity {
   public void onAsyncTaskCompleted(boolean success, int messageId) {
     removeDialog(DIALOG_PROGRESS_ID);
     Toast.makeText(this, messageId, success ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG).show();
-    startActivity(new Intent(this, MyTracks.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
+    startActivity(
+        new Intent(this, TrackDetailActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
     finish();
   }
 

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

@@ -19,7 +19,7 @@ import static com.google.android.apps.mytracks.Constants.RESUME_TRACK_EXTRA_NAME
 import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
@@ -485,7 +485,7 @@ public class TrackRecordingService extends Service {
           R.drawable.arrow_320, null /* tickerText */,
           System.currentTimeMillis());
       PendingIntent contentIntent = PendingIntent.getActivity(
-          this, 0 /* requestCode */, new Intent(this, MyTracks.class),
+          this, 0 /* requestCode */, new Intent(this, TrackDetailActivity.class),
           0 /* flags */);
       notification.setLatestEventInfo(this, getString(R.string.my_tracks_app_name),
           getString(R.string.track_record_notification), contentIntent);

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

@@ -19,7 +19,7 @@ package com.google.android.apps.mytracks.widgets;
 import static com.google.android.apps.mytracks.Constants.SETTINGS_NAME;
 import static com.google.android.apps.mytracks.Constants.TAG;
 
-import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.TrackDetailActivity;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
@@ -145,7 +145,7 @@ public class TrackWidgetProvider
     RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.track_widget);
 
     // Make all of the stats open the mytracks activity.
-    Intent intent = new Intent(context, MyTracks.class);
+    Intent intent = new Intent(context, TrackDetailActivity.class);
     PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
     views.setOnClickPendingIntent(R.id.appwidget_track_statistics, pendingIntent);
 

MyTracksTest/src/com/google/android/apps/mytracks/TrackDetailActivityTest.java

@@ -34,16 +34,16 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A unit test for {@link MyTracks} activity.
+ * A unit test for {@link TrackDetailActivity}.
  *
  * @author Bartlomiej Niechwiej
  */
-public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
+public class TrackDetailActivityTest extends ActivityInstrumentationTestCase2<TrackDetailActivity>{
   private SharedPreferences sharedPreferences;
   private TrackRecordingServiceConnection serviceConnection;
 
-  public MyTracksTest() {
-    super(MyTracks.class);
+  public TrackDetailActivityTest() {
+    super(TrackDetailActivity.class);
   }
 
   @Override