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>

MyTracks/res/values/arrays_do_not_translate.xml

@@ -182,6 +182,14 @@ limitations under the License.
     <item>@string/sensor_type_value_zephyr</item>
     <item>@string/sensor_type_value_none</item>
   </string-array>
+  <string-array name="share_track_options">
+    <item>@string/settings_sharing_share_track_drive</item>
+    <item>@string/settings_sharing_share_track_maps</item>
+  </string-array>
+  <string-array name="share_track_values">
+    <item>@string/settings_sharing_share_track_drive_value</item>
+    <item>@string/settings_sharing_share_track_maps_value</item>
+  </string-array>
   <string-array name="track_color_mode_options">
     <item>@string/settings_map_track_color_mode_single</item>
     <item>@string/settings_map_track_color_mode_fixed</item>

MyTracks/res/values/do_not_translate.xml

@@ -94,6 +94,8 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
   <string name="settings_recording_track_name_date_local_value">DATE_LOCAL</string>
   <string name="settings_recording_track_name_location_value">LOCATION</string>
   <string name="settings_recording_track_name_number_value">NUMBER</string>
+  <string name="settings_sharing_share_track_drive_value">DRIVE</string>
+  <string name="settings_sharing_share_track_maps_value">MAPS</string>
   <string name="track_action_end">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
   <string name="track_action_pause">com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK</string>
   <string name="track_action_resume">com.google.android.apps.mytracks.RESUME_CURRENT_TRACK</string>

MyTracks/res/values/keys.xml

@@ -49,6 +49,7 @@ limitations under the License.
   <string name="send_to_maps_key">sendToMaps</string>
   <string name="send_to_spreadsheets_key">sendToSpreadsheets</string>
   <string name="sensor_type_key">sensorType</string>
+  <string name="share_track_key">shareTrack</string>
   <string name="split_frequency_key">splitFrequency</string>
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
   <string name="stats_show_elevation_key">statsShowElevation</string>

MyTracks/res/values/strings.xml

@@ -1097,17 +1097,11 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Settings
   </string>
-  <string name="menu_share_maps"
-    translation_description="In the menu, to share a track via Google Maps.
+  <string name="menu_share"
+    translation_description="In the menu, to share a track.
 
       Character limit: ~20 (1 line)">
-    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 Google Drive
+    Share
   </string>
   <string name="menu_show_on_map"
     translation_description="In the menu, to show a track or a marker on the map.
@@ -2032,7 +2026,24 @@ limitations under the License.
       Tracks data.">
     Other apps can read, write, start/stop recording My Tracks data.
   </string>
-
+  <string name="settings_sharing_share_track"
+    translation_description="In the 'Sharing' settings, the option to configure how to share a
+      track.
+    
+      Character limit: ~23 (1 line)">
+    Share track
+  </string>
+  <string name="settings_sharing_share_track_drive"
+    translation_description="In the 'Sharing' settings, the option in the 'Share track' setting to
+      share via Google Drive.">
+    Via Google Drive
+  </string>
+  <string name="settings_sharing_share_track_maps"
+    translation_description="In the 'Sharing' settings, the option in the 'Share track' setting to
+      share via Google Maps url.">
+    Via Google Maps url
+  </string>  
+  
   <!-- Settings Stats -->
   <string name="settings_stats_coordinate"
     translation_description="In the 'Stats settings, the option to show latitude and longitude.

MyTracks/res/xml/sharing_settings.xml

@@ -16,6 +16,10 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_sharing" >
+  <ListPreference
+    android:defaultValue="@string/settings_sharing_share_track_drive_value"
+    android:key="@string/share_track_key"
+    android:title="@string/settings_sharing_share_track" />
   <CheckBoxPreference
     android:defaultValue="false"
     android:key="@string/allow_access_key"