Merge heads

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

@@ -16,10 +16,6 @@
 
 package com.google.android.apps.mytracks;
 
-import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
-import static com.google.android.apps.mytracks.Constants.MAP_TAB_TAG;
-import static com.google.android.apps.mytracks.Constants.STATS_TAB_TAG;
-
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.Waypoint;
@@ -29,15 +25,18 @@ import com.google.android.apps.mytracks.fragments.ChartSettingsDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.InstallEarthDialogFragment;
 import com.google.android.apps.mytracks.fragments.MapFragment;
+import com.google.android.apps.mytracks.fragments.MarkerAddDialogFragment;
 import com.google.android.apps.mytracks.fragments.StatsFragment;
+import com.google.android.apps.mytracks.fragments.StatsSettingsDialogFragment;
+import com.google.android.apps.mytracks.fragments.StatsSettingsDialogFragment.OnStatsSettingsChangedListener;
 import com.google.android.apps.mytracks.io.file.SaveActivity;
 import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
-import com.google.android.apps.mytracks.services.ITrackRecordingService;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
 import com.google.android.maps.mytracks.R;
@@ -50,9 +49,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.os.RemoteException;
-import android.speech.tts.TextToSpeech;
-import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -60,7 +56,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TabHost;
 import android.widget.TabHost.TabSpec;
-import android.widget.Toast;
 
 import java.util.List;
 
@@ -70,7 +65,8 @@ import java.util.List;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class TrackDetailActivity extends FragmentActivity {
+public class TrackDetailActivity extends AbstractMyTracksActivity
+    implements OnStatsSettingsChangedListener {
 
   public static final String EXTRA_TRACK_ID = "track_id";
   public static final String EXTRA_MARKER_ID = "marker_id";
@@ -101,15 +97,15 @@ public class TrackDetailActivity extends FragmentActivity {
    * class. Anonymous inner class will get garbage collected.
    */
   private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener =
-    new OnSharedPreferenceChangeListener() {
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-      // Note that key can be null
-      if (PreferencesUtils.getRecordingTrackIdKey(TrackDetailActivity.this).equals(key)) {
-        updateMenu();      
-      }
-    }
-  };
+      new OnSharedPreferenceChangeListener() {
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+          // Note that key can be null
+          if (PreferencesUtils.getRecordingTrackIdKey(TrackDetailActivity.this).equals(key)) {
+            updateMenu();
+          }
+        }
+      };
 
   /**
    * We are not displaying driving directions. Just an arbitrary track that is
@@ -133,9 +129,7 @@ public class TrackDetailActivity extends FragmentActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
     ApiAdapterFactory.getApiAdapter().hideTitle(this);
-    ApiAdapterFactory.getApiAdapter().configureActionBarHomeAsUp(this);
     setContentView(R.layout.track_detail);
     
     sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
@@ -143,21 +137,20 @@ public class TrackDetailActivity extends FragmentActivity {
     trackDataHub = ((MyTracksApplication) getApplication()).getTrackDataHub();
     trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
 
-    mapViewContainer = getLayoutInflater().inflate(R.layout.mytracks_layout, null);
+    mapViewContainer = getLayoutInflater().inflate(R.layout.map, null);
     tabHost = (TabHost) findViewById(android.R.id.tabhost);
     tabHost.setup();
     tabManager = new TabManager(this, tabHost, R.id.realtabcontent);
-    TabSpec mapTabSpec = tabHost.newTabSpec(MAP_TAB_TAG).setIndicator(
-        getString(R.string.track_detail_map_tab),
-        getResources().getDrawable(android.R.drawable.ic_menu_mapmode));
+    TabSpec mapTabSpec = tabHost.newTabSpec(MapFragment.MAP_FRAGMENT_TAG).setIndicator(
+        getString(R.string.track_detail_map_tab), getResources().getDrawable(R.drawable.tab_map));
     tabManager.addTab(mapTabSpec, MapFragment.class, null);
-    TabSpec chartTabSpec = tabHost.newTabSpec(CHART_TAB_TAG).setIndicator(
+    TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_chart_tab),
-        getResources().getDrawable(R.drawable.menu_elevation));
+        getResources().getDrawable(R.drawable.tab_chart));
     tabManager.addTab(chartTabSpec, ChartFragment.class, null);
-    TabSpec statsTabSpec = tabHost.newTabSpec(STATS_TAB_TAG).setIndicator(
+    TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_stats_tab),
-        getResources().getDrawable(R.drawable.ic_menu_statistics));
+        getResources().getDrawable(R.drawable.tab_stats));
     tabManager.addTab(statsTabSpec, StatsFragment.class, null);
     if (savedInstanceState != null) {
       tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAG_KEY));
@@ -165,13 +158,13 @@ public class TrackDetailActivity extends FragmentActivity {
 
     handleIntent(getIntent());
   }
- 
+
   @Override
   public void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
+    setIntent(intent);
     handleIntent(intent);
-  } 
-  
+  }
+
   @Override
   protected void onStart() {
     super.onStart();
@@ -240,39 +233,51 @@ public class TrackDetailActivity extends FragmentActivity {
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     String currentTabTag = tabHost.getCurrentTabTag();
-    menu.findItem(R.id.track_detail_chart_settings).setVisible(CHART_TAB_TAG.equals(currentTabTag));
-    menu.findItem(R.id.track_detail_my_location).setVisible(MAP_TAB_TAG.equals(currentTabTag));
-
-    // Set map or satellite mode
-    MapFragment mapFragment = (MapFragment) getSupportFragmentManager()
-        .findFragmentByTag(MAP_TAB_TAG);
-    boolean isSatelliteMode = mapFragment != null ? mapFragment.isSatelliteView() : false;
-    menu.findItem(R.id.track_detail_satellite_mode).setVisible(MAP_TAB_TAG.equals(currentTabTag))
-        .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode);
+    menu.findItem(R.id.track_detail_chart_settings).setVisible(
+        ChartFragment.CHART_FRAGMENT_TAG.equals(currentTabTag));
+    menu.findItem(R.id.track_detail_stats_settings).setVisible(
+        StatsFragment.STATS_FRAGMENT_TAG.equals(currentTabTag));   
+    MenuItem satelliteMode = menu.findItem(R.id.track_detail_satellite_mode)
+        .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag));
+    
+    if (satelliteMode.isVisible()) {
+      MapFragment mapFragment = (MapFragment) getSupportFragmentManager()
+          .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
+      /*
+       * The current tag is mapFragment, thus safe to call its methods like
+       * isSatelliteView.
+       */
+      boolean isSatelliteMode = mapFragment != null ? mapFragment.isSatelliteView() : false;
+      menu.findItem(R.id.track_detail_satellite_mode).setTitle(
+          isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode);
+    }
 
     return super.onPrepareOptionsMenu(menu);
   }
 
+  @Override
+  protected void onHomeSelected() {
+    Intent intent = IntentUtils.newIntent(this, TrackListActivity.class);
+    startActivity(intent);
+  }
+  
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     MapFragment mapFragment;
     Intent intent;
     switch (item.getItemId()) {
-      case android.R.id.home:
-        startTrackListActivity();
-        return true;
       case R.id.track_detail_stop_recording:
         updateMenuItems(false);
         TrackRecordingServiceConnectionUtils.stop(this, trackRecordingServiceConnection);
         return true;
       case R.id.track_detail_insert_marker:
-        startActivity(new Intent(this, MarkerEditActivity.class)
-            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
+        MarkerAddDialogFragment.newInstance(trackId)
+            .show(getSupportFragmentManager(), MarkerAddDialogFragment.MARKER_ADD_DIALOG_TAG);
         return true;
       case R.id.track_detail_play:
         if (isEarthInstalled()) {
           AnalyticsUtils.sendPageViews(this, "/action/play");
-          intent = new Intent(this, SaveActivity.class)
+          intent = IntentUtils.newIntent(this, SaveActivity.class)
               .putExtra(SaveActivity.EXTRA_TRACK_ID, trackId)
               .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) TrackFileFormat.KML)
               .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true);
@@ -282,13 +287,13 @@ public class TrackDetailActivity extends FragmentActivity {
               getSupportFragmentManager(), InstallEarthDialogFragment.INSTALL_EARTH_DIALOG_TAG);
         }
         return true;
-      case R.id.track_detail_share_map:
-        intent = new Intent(this, UploadServiceChooserActivity.class)
+      case R.id.track_detail_share_map_url:
+        intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, false, false));
         startActivity(intent);
         return true;
-      case R.id.track_detail_share_fusion_table:
-        intent = new Intent(this, UploadServiceChooserActivity.class)
+      case R.id.track_detail_share_fusion_table_url:
+        intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, false, true, false));
         startActivity(intent);
         return true;
@@ -305,13 +310,12 @@ public class TrackDetailActivity extends FragmentActivity {
         startSaveActivity(TrackFileFormat.TCX, true);
         return true;
       case R.id.track_detail_markers:
-        intent = new Intent(this, MarkerListActivity.class)
-            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK)
+        intent = IntentUtils.newIntent(this, MarkerListActivity.class)
             .putExtra(MarkerListActivity.EXTRA_TRACK_ID, trackId);
         startActivity(intent);
         return true;
       case R.id.track_detail_send_google:
-        intent = new Intent(this, UploadServiceChooserActivity.class)
+        intent = IntentUtils.newIntent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, true, true));
         startActivity(intent);
         return true;
@@ -328,40 +332,43 @@ public class TrackDetailActivity extends FragmentActivity {
         startSaveActivity(TrackFileFormat.TCX, false);
         return true;
       case R.id.track_detail_edit:
-        startActivity(new Intent(this, TrackEditActivity.class)
-            .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId));
+        intent = IntentUtils.newIntent(this, TrackEditActivity.class)
+            .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
+        startActivity(intent);
         return true;
       case R.id.track_detail_delete:
         DeleteOneTrackDialogFragment.newInstance(trackId).show(
             getSupportFragmentManager(), DeleteOneTrackDialogFragment.DELETE_ONE_TRACK_DIALOG_TAG);
         return true;
-      case R.id.track_detail_my_location:
-        mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(MAP_TAB_TAG);
-        if (mapFragment != null) {
-          mapFragment.showMyLocation();
-        }
-        return true;
       case R.id.track_detail_satellite_mode:
-        mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(MAP_TAB_TAG);
+        mapFragment = (MapFragment) getSupportFragmentManager()
+            .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
         if (mapFragment != null) {
           mapFragment.setSatelliteView(!mapFragment.isSatelliteView());
         }
         return true;
+      case R.id.track_detail_sensor_state:
+        intent = IntentUtils.newIntent(this, SensorStateActivity.class);
+        startActivity(intent);
+        return true;
       case R.id.track_detail_chart_settings:
         new ChartSettingsDialogFragment().show(
             getSupportFragmentManager(), ChartSettingsDialogFragment.CHART_SETTINGS_DIALOG_TAG);
         return true;
-      case R.id.track_detail_sensor_state:
-        startActivity(new Intent(this, SensorStateActivity.class));
+      case R.id.track_detail_stats_settings:
+        new StatsSettingsDialogFragment().show(
+            getSupportFragmentManager(), StatsSettingsDialogFragment.STATS_SETTINGS_DIALOG_TAG);
         return true;
       case R.id.track_detail_settings:
-        startActivity(new Intent(this, SettingsActivity.class));
+        intent = IntentUtils.newIntent(this, SettingsActivity.class);
+        startActivity(intent);
         return true;
       case R.id.track_detail_help:
-        startActivity(new Intent(this, HelpActivity.class));
+        intent = IntentUtils.newIntent(this, HelpActivity.class);
+        startActivity(intent);
         return true;
       default:
-        return false;
+        return super.onOptionsItemSelected(item);
     }
   }
 
@@ -369,25 +376,8 @@ public class TrackDetailActivity extends FragmentActivity {
   public boolean onTrackballEvent(MotionEvent event) {
     if (event.getAction() == MotionEvent.ACTION_DOWN) {
       if (TrackRecordingServiceConnectionUtils.isRecording(this, trackRecordingServiceConnection)) {
-        ITrackRecordingService trackRecordingService = trackRecordingServiceConnection
-            .getServiceIfBound();
-        if (trackRecordingService == null) {
-          Log.e(TAG, "The track recording service is null");
-          return true;
-        }
-        boolean success = false;
-        try {
-          long waypointId = trackRecordingService.insertWaypoint(
-              WaypointCreationRequest.DEFAULT_STATISTICS);
-          if (waypointId != -1L) {
-            success = true;
-          }
-        } catch (RemoteException e) {
-          Log.e(TAG, "Unable to insert waypoint", e);
-        }
-        Toast.makeText(this,
-            success ? R.string.marker_edit_add_success : R.string.marker_edit_add_error,
-            success ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG).show();
+        TrackRecordingServiceConnectionUtils.addMarker(
+            this, trackRecordingServiceConnection, WaypointCreationRequest.DEFAULT_STATISTICS);
         return true;
       }
     }
@@ -401,6 +391,13 @@ public class TrackDetailActivity extends FragmentActivity {
     return mapViewContainer;
   }
 
+  @Override
+  public void onStatsSettingsChanged() {
+    StatsFragment statsFragment = (StatsFragment) getSupportFragmentManager()
+        .findFragmentByTag(StatsFragment.STATS_FRAGMENT_TAG);
+    statsFragment.updateUi();    
+  }
+  
   /**
    * Handles the data in the intent.
    */
@@ -410,14 +407,16 @@ public class TrackDetailActivity extends FragmentActivity {
     if (markerId != -1L) {
       Waypoint waypoint = MyTracksProviderUtils.Factory.get(this).getWaypoint(markerId);
       if (waypoint == null) {
-        startTrackListActivity();
+        Intent newIntent = IntentUtils.newIntent(this, TrackListActivity.class);
+        startActivity(newIntent);
         finish();
         return;
       }
       trackId = waypoint.getTrackId();
     }
     if (trackId == -1L) {
-      startTrackListActivity();
+      Intent newIntent = IntentUtils.newIntent(this, TrackListActivity.class);
+      startActivity(newIntent);
       finish();
       return;
     }
@@ -425,9 +424,9 @@ public class TrackDetailActivity extends FragmentActivity {
 
     if (markerId != -1L) {
       MapFragment mapFragmet = (MapFragment) getSupportFragmentManager()
-          .findFragmentByTag(MAP_TAB_TAG);
+          .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
       if (mapFragmet != null) {
-        tabHost.setCurrentTabByTag(MAP_TAB_TAG);
+        tabHost.setCurrentTabByTag(MapFragment.MAP_FRAGMENT_TAG);
         mapFragmet.showMarker(trackId, markerId);
       } else {
         Log.e(TAG, "MapFragment is null");
@@ -474,14 +473,6 @@ public class TrackDetailActivity extends FragmentActivity {
     }
   }
 
-  /**
-   * Starts the {@link TrackListActivity}.
-   */
-  private void startTrackListActivity() {
-    startActivity(new Intent(this, TrackListActivity.class)
-        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
-  }
-
   /**
    * Starts the {@link SaveActivity} to save a track.
    *
@@ -489,7 +480,7 @@ public class TrackDetailActivity extends FragmentActivity {
    * @param shareTrack true to share the track after saving
    */
   private void startSaveActivity(TrackFileFormat trackFileFormat, boolean shareTrack) {
-    Intent intent = new Intent(this, SaveActivity.class)
+    Intent intent = IntentUtils.newIntent(this, SaveActivity.class)
         .putExtra(SaveActivity.EXTRA_TRACK_ID, trackId)
         .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat)
         .putExtra(SaveActivity.EXTRA_SHARE_TRACK, shareTrack);