Renamed AbstractSendToGoogleActivity.

myTracks/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java

@@ -30,7 +30,7 @@ import android.view.MenuItem;
  * 
  * @author Jimmy Shih
  */
-public abstract class AbstractMyTracksActivity extends FragmentActivity {
+public abstract class AbstractActivity extends FragmentActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java

@@ -49,7 +49,7 @@ import java.util.ArrayList;
  *
  * @author Jimmy Shih
  */
-public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActivity implements ConfirmDeleteCaller {
+public abstract class AbstractTrackActivity extends AbstractActivity implements ConfirmDeleteCaller {
 
   private static final int DELETE_REQUEST_CODE = 3;
   protected static final int GOOGLE_PLAY_SERVICES_REQUEST_CODE = 4;

myTracks/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java

@@ -31,7 +31,7 @@ import java.util.List;
  *
  * @author Fergus Nelson
  */
-public class AggregatedStatsActivity extends AbstractMyTracksActivity {
+public class AggregatedStatsActivity extends AbstractActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java

@@ -37,7 +37,7 @@ import java.util.ArrayList;
  * 
  * @author Leif Hendrik Wilden
  */
-public class MarkerDetailActivity extends AbstractMyTracksActivity implements DeleteMarkerCaller {
+public class MarkerDetailActivity extends AbstractActivity implements DeleteMarkerCaller {
 
   public static final String EXTRA_MARKER_ID = "marker_id";
   private static final String TAG = MarkerDetailActivity.class.getSimpleName();

myTracks/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java

@@ -38,7 +38,7 @@ import android.widget.EditText;
  *
  * @author Jimmy Shih
  */
-public class MarkerEditActivity extends AbstractMyTracksActivity {
+public class MarkerEditActivity extends AbstractActivity {
 
   private static final String TAG = MarkerEditActivity.class.getSimpleName();
 

myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java

@@ -54,7 +54,7 @@ import android.widget.ListView;
  * 
  * @author Leif Hendrik Wilden
  */
-public class MarkerListActivity extends AbstractMyTracksActivity implements DeleteMarkerCaller {
+public class MarkerListActivity extends AbstractActivity implements DeleteMarkerCaller {
 
   public static final String EXTRA_TRACK_ID = "track_id";
 
@@ -191,7 +191,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
       }
     };
     listView.setAdapter(resourceCursorAdapter);
-    AbstractSendToGoogleActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
+    AbstractTrackActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
 
     final long firstWaypointId = myTracksProviderUtils.getFirstWaypointId(trackId);
     getSupportLoaderManager().initLoader(0, null, new LoaderCallbacks<Cursor>() {
@@ -243,7 +243,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
     getMenuInflater().inflate(R.menu.marker_list, menu);
     insertMarkerMenuItem = menu.findItem(R.id.marker_list_insert_marker);
     searchMenuItem = menu.findItem(R.id.marker_list_search);
-    AbstractSendToGoogleActivity.configureSearchWidget(this, searchMenuItem, null);
+    AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, null);
     return super.onCreateOptionsMenu(menu);
   }
 

myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java

@@ -73,7 +73,7 @@ import java.util.SortedSet;
  * 
  * @author Rodrigo Damazio
  */
-public class SearchListActivity extends AbstractSendToGoogleActivity implements DeleteMarkerCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class SearchListActivity extends AbstractTrackActivity implements DeleteMarkerCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
 
   private static final String TAG = SearchListActivity.class.getSimpleName();
 
@@ -243,7 +243,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
       }
     };
     listView.setAdapter(arrayAdapter);
-    AbstractSendToGoogleActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
+    AbstractTrackActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
     handleIntent(getIntent());
   }
 
@@ -283,7 +283,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
   public boolean onCreateOptionsMenu(Menu menu) {
     getMenuInflater().inflate(R.menu.search_list, menu);
     searchMenuItem = menu.findItem(R.id.search_list_search);
-    AbstractSendToGoogleActivity.configureSearchWidget(this, searchMenuItem, null);
+    AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, null);
     return super.onCreateOptionsMenu(menu);
   }
 

myTracks/src/main/java/com/google/android/apps/mytracks/SensorStateActivity.java

@@ -39,7 +39,7 @@ import android.widget.TextView;
  * 
  * @author Sandor Dornbush
  */
-public class SensorStateActivity extends AbstractMyTracksActivity {
+public class SensorStateActivity extends AbstractActivity {
 
   private static final String TAG = SensorStateActivity.class.getName();
   

myTracks/src/main/java/com/google/android/apps/mytracks/TrackController.java

@@ -80,7 +80,7 @@ public class TrackController {
     this.trackRecordingServiceConnection = trackRecordingServiceConnection;
     this.alwaysShow = alwaysShow;
     handler = new Handler();
-    containerView = activity.findViewById(R.id.track_controler_container);
+    containerView = activity.findViewById(R.id.track_controller_container);
     statusTextView = activity.findViewById(R.id.track_controller_status);
     totalTimeTextView = activity.findViewById(R.id.track_controller_total_time);
     recordImageButton = activity.findViewById(R.id.track_controller_record);

myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -74,7 +74,7 @@ import java.util.Date;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class TrackDetailActivity extends AbstractSendToGoogleActivity
+public class TrackDetailActivity extends AbstractTrackActivity
         implements ChooseActivityTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
 
   private static final String TAG = TrackDetailActivity.class.getSimpleName();

myTracks/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java

@@ -44,7 +44,7 @@ import android.widget.Spinner;
  * 
  * @author Leif Hendrik Wilden
  */
-public class TrackEditActivity extends AbstractMyTracksActivity implements ChooseActivityTypeCaller {
+public class TrackEditActivity extends AbstractActivity implements ChooseActivityTypeCaller {
 
   public static final String EXTRA_TRACK_ID = "track_id";
   public static final String EXTRA_NEW_TRACK = "new_track";

myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java

@@ -85,7 +85,7 @@ import java.util.Locale;
  * 
  * @author Leif Hendrik Wilden
  */
-public class TrackListActivity extends AbstractSendToGoogleActivity implements FileTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
+public class TrackListActivity extends AbstractTrackActivity implements FileTypeCaller, ConfirmDeleteDialogFragment.ConfirmDeleteCaller {
 
   private static final String TAG = TrackListActivity.class.getSimpleName();
   private static final String[] PROJECTION = new String[] { TracksColumns._ID, TracksColumns.NAME,
@@ -374,7 +374,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity implements F
       }
     };
     listView.setAdapter(sectionResourceCursorAdapter);
-    AbstractSendToGoogleActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
+    AbstractTrackActivity.configureListViewContextualMenu(this, listView, contextualActionModeCallback);
 
     getSupportLoaderManager().initLoader(0, null, loaderCallbacks);
     showStartupDialogs();
@@ -458,7 +458,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity implements F
     getMenuInflater().inflate(R.menu.track_list, menu);
 
     searchMenuItem = menu.findItem(R.id.track_list_search);
-    AbstractSendToGoogleActivity.configureSearchWidget(this, searchMenuItem, trackController);
+    AbstractTrackActivity.configureSearchWidget(this, searchMenuItem, trackController);
 
     startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
     aggregatedStatisticsMenuItem = menu.findItem(R.id.track_list_aggregated_statistics);

myTracks/src/main/res/layout-land/track_controller.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <LinearLayout
     android:background="@color/track_controller_background"
-    android:id="@+id/track_controler_container"
+    android:id="@+id/track_controller_container"
     android:layout_height="match_parent"
     android:layout_width="wrap_content"
     android:orientation="vertical"

myTracks/src/main/res/layout/track_controller.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <LinearLayout
     android:background="@color/track_controller_background"
-    android:id="@+id/track_controler_container"
+    android:id="@+id/track_controller_container"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:paddingBottom="8dp"