Combine share via drive and share via maps url into a share button.

Use settings to choose between drive and maps.

MyTracks/res/menu/list_context_menu.xml

@@ -16,10 +16,10 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_share_drive"
-    android:id="@+id/list_context_menu_share_drive"
+    android:icon="@drawable/menu_share"
+    android:id="@+id/list_context_menu_share"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_share_drive"/>
+    android:title="@string/menu_share"/>
   <item
     android:icon="@drawable/menu_show_on_map"
     android:id="@+id/list_context_menu_show_on_map"

MyTracks/res/menu/map.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
     android:icon="@drawable/menu_map_layer"
-    android:orderInCategory="6"
+    android:orderInCategory="5"
     android:showAsAction="ifRoom"
     android:title="@string/menu_map_layer">
     <menu>

MyTracks/res/menu/track_detail.xml

@@ -28,35 +28,28 @@ limitations under the License.
     android:showAsAction="ifRoom"
     android:title="@string/menu_play"/>
   <item
-    android:icon="@drawable/menu_share_drive"
-    android:id="@+id/track_detail_share_drive"
+    android:icon="@drawable/menu_share"
+    android:id="@+id/track_detail_share"
     android:orderInCategory="3"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_share_drive">
-  </item>
-  <item
-    android:icon="@drawable/menu_share_maps"
-    android:id="@+id/track_detail_share_maps"
-    android:orderInCategory="4"
-    android:showAsAction="ifRoom"
-    android:title="@string/menu_share_maps">
+    android:title="@string/menu_share">
   </item>
   <item
     android:icon="@drawable/menu_markers"
     android:id="@+id/track_detail_markers"
-    android:orderInCategory="5"
+    android:orderInCategory="4"
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
-  <!-- android:orderInCategory="6" is in map.xml -->
+  <!-- android:orderInCategory="5" is in map.xml -->
   <item
     android:icon="@drawable/menu_send_google"
     android:id="@+id/track_detail_send_google"
-    android:orderInCategory="7"
+    android:orderInCategory="6"
     android:title="@string/menu_send_google"/>
   <item
     android:icon="@drawable/menu_save"
     android:id="@+id/track_detail_save"
-    android:orderInCategory="8"
+    android:orderInCategory="7"
     android:title="@string/menu_save">
     <menu>
       <item
@@ -76,41 +69,41 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/track_detail_edit"
-    android:orderInCategory="9"
+    android:orderInCategory="8"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_detail_delete"
-    android:orderInCategory="10"
+    android:orderInCategory="9"
     android:title="@string/menu_delete"/>
   <item
     android:icon="@drawable/menu_voice_frequency"
     android:id="@+id/track_detail_voice_frequency"
-    android:orderInCategory="11"
+    android:orderInCategory="10"
     android:title="@string/menu_voice_frequency"/>
   <item
     android:icon="@drawable/menu_split_frequency"
     android:id="@+id/track_detail_split_frequency"
-    android:orderInCategory="12"
+    android:orderInCategory="11"
     android:title="@string/menu_split_frequency"/>
   <item
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
-    android:orderInCategory="13"
+    android:orderInCategory="12"
     android:title="@string/menu_sensor_state"/>
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_detail_settings"
-    android:orderInCategory="14"
+    android:orderInCategory="13"
     android:title="@string/menu_settings"/>
   <item
     android:icon="@drawable/menu_feedback"
     android:id="@+id/track_detail_feedback"
-    android:orderInCategory="15"
+    android:orderInCategory="14"
     android:title="@string/menu_feedback"/>
   <item
     android:icon="@drawable/menu_help"
     android:id="@+id/track_detail_help"
-    android:orderInCategory="16"
+    android:orderInCategory="15"
     android:title="@string/menu_help"/>
 </menu>