Rename to Share via Google Drive and Share via Google Maps.

MyTracks/res/menu/track_detail.xml

@@ -35,11 +35,11 @@ limitations under the License.
     android:title="@string/menu_share_drive">
   </item>
   <item
-    android:icon="@drawable/menu_share"
-    android:id="@+id/track_detail_share"
+    android:icon="@drawable/menu_share_maps"
+    android:id="@+id/track_detail_share_maps"
     android:orderInCategory="4"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_share">
+    android:title="@string/menu_share_maps">
   </item>
   <item
     android:icon="@drawable/menu_markers"

MyTracks/res/values/strings.xml

@@ -1246,17 +1246,17 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Settings
   </string>
-  <string name="menu_share"
-    translation_description="In the menu, to share a track.
+  <string name="menu_share_maps"
+    translation_description="In the menu, to share a track via Google Maps.
 
       Character limit: ~20 (1 line)">
-    Share
+    Share via Google Maps
   </string>
   <string name="menu_share_drive"
     translation_description="In the menu, to share a track via Google Drive.
 
       Character limit: ~20 (1 line)">
-    Share via Drive
+    Share via Google Drive
   </string>
   <string name="menu_show_on_map"
     translation_description="In the menu, to show a track or a marker on the map.
@@ -2234,7 +2234,7 @@ limitations under the License.
     This will upload your track to Google Drive so you can share the file with friends. The file
     will be private and only those you have shared with will have access.
   </string>
-  <string name="share_track_map_confirm_message"
+  <string name="share_track_maps_confirm_message"
     translation_description="The confirmation message when sharing a track via Google Maps with
       friends.
 

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

@@ -99,7 +99,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
   private MenuItem insertMarkerMenuItem;
   private MenuItem playMenuItem;
   private MenuItem shareDriveMenuItem;
-  private MenuItem shareMenuItem;
+  private MenuItem shareMapsMenuItem;
   private MenuItem sendGoogleMenuItem;
   private MenuItem saveMenuItem;
   private MenuItem voiceFrequencyMenuItem;
@@ -304,7 +304,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
 
     insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
     playMenuItem = menu.findItem(R.id.track_detail_play);
-    shareMenuItem = menu.findItem(R.id.track_detail_share);
+    shareMapsMenuItem = menu.findItem(R.id.track_detail_share_maps);
     sendGoogleMenuItem = menu.findItem(R.id.track_detail_send_google);
     saveMenuItem = menu.findItem(R.id.track_detail_save);
     voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
@@ -350,10 +350,10 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
             getString(R.string.share_track_drive_confirm_message), trackId)
             .show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
         return true;
-      case R.id.track_detail_share:
+      case R.id.track_detail_share_maps:
         ConfirmDialogFragment.newInstance(R.string.confirm_share_map_key,
             PreferencesUtils.CONFIRM_SHARE_MAP_DEFAULT, StringUtils.getHtml(
-                this, R.string.share_track_map_confirm_message, R.string.maps_public_unlisted_url),
+                this, R.string.share_track_maps_confirm_message, R.string.maps_public_unlisted_url),
             trackId).show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
         return true;
       case R.id.track_detail_markers:
@@ -553,8 +553,8 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
     if (playMenuItem != null) {
       playMenuItem.setVisible(!isRecording);
     }
-    if (shareMenuItem != null) {
-      shareMenuItem.setVisible(!isRecording);
+    if (shareMapsMenuItem != null) {
+      shareMapsMenuItem.setVisible(!isRecording);
     }
     if (shareDriveMenuItem != null && shareDriveMenuItem.isEnabled()) {
       shareDriveMenuItem.setVisible(!isRecording);

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java

@@ -135,7 +135,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
    * @return null when no such item
    */
   private View findShareItem(int index) {
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share_maps), true);
     ArrayList<View> views = EndToEndTestUtils.SOLO.getViews();
     int i = 0;
     for (View view : views) {