ICS UI: Moving per-tab menu items to the MenuManager.

This will make more sense once tabs are fragments instead of activities.

MyTracks/res/menu/main.xml

@@ -20,6 +20,24 @@
     android:title="@string/menu_markers"
     android:showAsAction="ifRoom"/>
 
+  <item android:id="@+id/menu_chart_settings"
+    android:icon="@drawable/chart_settings"
+    android:title="@string/menu_chart_view_chart_settings"
+    android:showAsAction="ifRoom"
+    android:visible="false"/>
+
+  <item android:id="@+id/menu_my_location"
+    android:icon="@android:drawable/ic_menu_mylocation"
+    android:title="@string/menu_map_view_my_location"
+    android:showAsAction="ifRoom"
+    android:visible="false"/>
+
+  <item android:id="@+id/menu_layers"
+    android:icon="@android:drawable/ic_menu_mapmode"
+    android:title="@string/menu_map_view_satellite_mode"
+    android:showAsAction="ifRoom"
+    android:visible="false"/>
+
   <item android:id="@+id/menu_sensor_state"
     android:icon="@drawable/ic_menu_sensorstatus"
     android:orderInCategory="1000"

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

@@ -41,8 +41,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.location.Location;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
@@ -60,7 +58,8 @@ import java.util.EnumSet;
  */
 public class ChartActivity extends Activity implements TrackDataListener {
 
-  private static final int CHART_SETTINGS_DIALOG = 1;
+  public static final int CHART_SETTINGS_DIALOG = 1;
+
   private final DoubleBuffer elevationBuffer =
       new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
   private final DoubleBuffer speedBuffer =
@@ -83,7 +82,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
    * UI elements:
    */
   private ChartView chartView;
-  private MenuItem chartSettingsMenuItem;
   private LinearLayout busyPane;
   private ZoomControls zoomControls;
 
@@ -187,25 +185,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
     }
   }
 
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    chartSettingsMenuItem = menu.add(Menu.NONE, Constants.MENU_CHART_SETTINGS, Menu.NONE,
-        R.string.menu_chart_view_chart_settings);
-    chartSettingsMenuItem.setIcon(R.drawable.chart_settings);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case Constants.MENU_CHART_SETTINGS:
-        showDialog(CHART_SETTINGS_DIALOG);
-        return true;
-    }
-    return super.onOptionsItemSelected(item);
-  }
-
   @Override
   protected Dialog onCreateDialog(int id) {
     if (id == CHART_SETTINGS_DIALOG) {

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

@@ -35,7 +35,7 @@ public abstract class Constants {
 
   /*
    * onActivityResult request codes:
-   * 
+   *
    * TODO: These should be moved to the
    * activities that call startActivityForResult. Thus do not need to keep a
    * global order across all activities.
@@ -59,14 +59,6 @@ public abstract class Constants {
   public static final int WELCOME = 16;
   public static final int CHOOSE_ACCOUNT = 17;
 
-  /*
-   * Menu ids:
-   */
-
-  public static final int MENU_MY_LOCATION = 1;
-  public static final int MENU_TOGGLE_LAYERS = 2;
-  public static final int MENU_CHART_SETTINGS = 3;
-
   /*
    * Context menu ids:
    */
@@ -89,6 +81,14 @@ public abstract class Constants {
   public static final int MENU_SAVE_TCX_FILE = 210;
   public static final int MENU_CLEAR_MAP = 211;
 
+  /*
+   * Main screen tab tags:
+   */
+
+  public static final String MAP_TAB_TAG = "map";
+  public static final String STATS_TAB_TAG = "stats";
+  public static final String CHART_TAB_TAG = "chart";
+
   /**
    * The number of distance readings to smooth to get a stable signal.
    */

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

@@ -102,9 +102,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
   private LinearLayout busyPane;
   private ImageButton optionsBtn;
 
-  private MenuItem myLocation;
-  private MenuItem toggleLayers;
-
   /**
    * We are not displaying driving directions. Just an arbitrary track that is
    * not associated to any licensed mapping data. Therefore it should be okay to
@@ -257,6 +254,20 @@ public class MapActivity extends com.google.android.maps.MapActivity
     return r.contains(geoPoint);
   }
 
+  /**
+   * Centers (and keeps centered) the map on the current location.
+   */
+  public void showMyLocation() {
+    dataHub.forceUpdateLocation();
+    keepMyLocationVisible = true;
+    if (mapView.getZoomLevel() < 18) {
+      mapView.getController().setZoom(18);
+    }
+    if (currentLocation != null) {
+      showCurrentLocation();
+    }
+  }
+
   /**
    * Moves the location pointer to the current location and center the map if
    * the current location is outside the visible area.
@@ -452,45 +463,18 @@ public class MapActivity extends com.google.android.maps.MapActivity
     }
   }
 
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    myLocation = menu.add(
-        Menu.NONE, Constants.MENU_MY_LOCATION, Menu.NONE, R.string.menu_map_view_my_location);
-    myLocation.setIcon(android.R.drawable.ic_menu_mylocation);
-    toggleLayers = menu.add(
-        Menu.NONE, Constants.MENU_TOGGLE_LAYERS, Menu.NONE, R.string.menu_map_view_satellite_mode);
-    toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode);
-    return true;
+  /**
+   * Returns whether the map is currently in satellite view mode.
+   */
+  public boolean isSatelliteView() {
+    return mapView.isSatellite();
   }
 
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    toggleLayers.setTitle(mapView.isSatellite() ?
-        R.string.menu_map_view_map_mode : R.string.menu_map_view_satellite_mode);
-    return super.onPrepareOptionsMenu(menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case Constants.MENU_MY_LOCATION: {
-        dataHub.forceUpdateLocation();
-        keepMyLocationVisible = true;
-        if (mapView.getZoomLevel() < 18) {
-          mapView.getController().setZoom(18);
-        }
-        if (currentLocation != null) {
-          showCurrentLocation();
-        }
-        return true;
-      }
-      case Constants.MENU_TOGGLE_LAYERS: {
-        mapView.setSatellite(!mapView.isSatellite());
-        return true;
-      }
-    }
-    return super.onOptionsItemSelected(item);
+  /**
+   * Changes whether the map should be in satellite view mode.
+   */
+  public void setSatelliteView(boolean sat) {
+    mapView.setSatellite(sat);
   }
 
   @Override

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

@@ -15,6 +15,9 @@
  */
 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 com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -41,7 +44,8 @@ class MenuManager {
   }
 
   public void onPrepareOptionsMenu(Menu menu, boolean hasRecorded,
-      boolean isRecording, boolean hasSelectedTrack) {
+      boolean isRecording, boolean hasSelectedTrack,
+      boolean isSatelliteMode, String currentTabTag) {
     menu.findItem(R.id.menu_markers)
         .setEnabled(hasRecorded && hasSelectedTrack);
     menu.findItem(R.id.menu_record_track)
@@ -50,6 +54,18 @@ class MenuManager {
     menu.findItem(R.id.menu_stop_recording)
         .setEnabled(isRecording)
         .setVisible(isRecording);
+
+    menu.findItem(R.id.menu_chart_settings)
+        .setVisible(CHART_TAB_TAG.equals(currentTabTag));
+
+    boolean isMapTab = MAP_TAB_TAG.equals(currentTabTag);
+    menu.findItem(R.id.menu_my_location)
+        .setVisible(isMapTab);
+    menu.findItem(R.id.menu_layers)
+        .setVisible(isMapTab)
+        .setTitle(isSatelliteMode
+            ? R.string.menu_map_view_map_mode
+            : R.string.menu_map_view_satellite_mode);
   }
 
   public boolean onOptionsItemSelected(MenuItem item) {
@@ -85,7 +101,20 @@ class MenuManager {
       case R.id.menu_help: {
         return startActivity(WelcomeActivity.class);
       }
+      case R.id.menu_chart_settings: {
+        activity.showChartSettings();
+        return true;
+      }
+      case R.id.menu_my_location: {
+        activity.showMyLocation();
+        return true;
+      }
+      case R.id.menu_layers: {
+        activity.toggleSatelliteView();
+        return true;
+      }
     }
+
     return false;
   }
 

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

@@ -15,6 +15,9 @@
  */
 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 static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.analytics.GoogleAnalyticsTracker;
@@ -168,14 +171,14 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
     final Resources res = getResources();
     final TabHost tabHost = getTabHost();
-    tabHost.addTab(tabHost.newTabSpec("tab1")
+    tabHost.addTab(tabHost.newTabSpec(MAP_TAB_TAG)
         .setIndicator("Map", res.getDrawable(
             android.R.drawable.ic_menu_mapmode))
         .setContent(new Intent(this, MapActivity.class)));
-    tabHost.addTab(tabHost.newTabSpec("tab2")
+    tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
         .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
         .setContent(new Intent(this, StatsActivity.class)));
-    tabHost.addTab(tabHost.newTabSpec("tab3")
+    tabHost.addTab(tabHost.newTabSpec(CHART_TAB_TAG)
         .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation))
         .setContent(new Intent(this, ChartActivity.class)));
 
@@ -303,9 +306,15 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
+    MapActivity map = getMapTab();
+    boolean isSatelliteView = map != null ? map.isSatelliteView() : false;
+
     menuManager.onPrepareOptionsMenu(menu, providerUtils.getLastTrack() != null,
         ServiceUtils.isRecording(this, serviceConnection.getServiceIfBound(), preferences),
-        dataHub.isATrackSelected());
+        dataHub.isATrackSelected(),
+        isSatelliteView,
+        getTabHost().getCurrentTabTag());
+
     return super.onPrepareOptionsMenu(menu);
   }
 
@@ -367,8 +376,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
         if (results != null) {
           final long waypointId = results.getLongExtra(WaypointDetails.WAYPOINT_ID_EXTRA, -1);
           if (waypointId >= 0) {
-            MapActivity map =
-                (MapActivity) getLocalActivityManager().getActivity("tab1");
+            MapActivity map = getMapTab();
             if (map != null) {
               getTabHost().setCurrentTab(0);
               map.showWaypoint(waypointId);
@@ -485,4 +493,33 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   long getSelectedTrackId() {
     return dataHub.getSelectedTrackId();
   }
+
+  public void showChartSettings() {
+    ChartActivity chart = getChartTab();
+    if (chart != null) {
+      chart.showDialog(ChartActivity.CHART_SETTINGS_DIALOG);
+    }
+  }
+
+  public void toggleSatelliteView() {
+    MapActivity mapTab = getMapTab();
+    if (mapTab != null) {
+      mapTab.setSatelliteView(!getMapTab().isSatelliteView());
+    }
+  }
+
+  public void showMyLocation() {
+    MapActivity mapTab = getMapTab();
+    if (mapTab != null) {
+      mapTab.showMyLocation();
+    }
+  }
+
+  private MapActivity getMapTab() {
+    return (MapActivity) getLocalActivityManager().getActivity(MAP_TAB_TAG);
+  }
+
+  private ChartActivity getChartTab() {
+    return (ChartActivity) getLocalActivityManager().getActivity(CHART_TAB_TAG);
+  }
 }