Combine save and send to google into export.

MyTracks/res/layout/choose_upload_service.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <TableLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:padding="8dp"
-    android:stretchColumns="1" >
-    <TableRow>
-      <ImageView
-        android:contentDescription="@string/send_google_maps"
-        android:src="@drawable/google_maps_icon"
-        style="@style/ChooseUploadServiceImageView" />
-      <CheckBox
-        android:id="@+id/choose_upload_service_maps"
-        android:text="@string/send_google_maps"
-        style="@style/ChooseUploadServiceCheckBox" />
-    </TableRow>
-    <TableRow android:id="@+id/choose_upload_service_maps_options" >
-      <RadioGroup
-        android:layout_column="1"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_width="0dp" >
-        <RadioButton
-          android:id="@+id/choose_upload_service_new_map"
-          style="@style/TextMedium" />
-        <RadioButton
-          android:id="@+id/choose_upload_service_existing_map"
-          android:text="@string/send_google_existing_map"
-          style="@style/TextMedium" />
-      </RadioGroup>
-    </TableRow>
-    <TableRow>
-      <ImageView
-        android:contentDescription="@string/send_google_fusion_tables"
-        android:src="@drawable/google_fusion_tables_icon"
-        style="@style/ChooseUploadServiceImageView" />
-      <CheckBox
-        android:id="@+id/choose_upload_service_fusion_tables"
-        style="@style/ChooseUploadServiceCheckBox" />
-    </TableRow>
-    <TableRow>
-      <ImageView
-        android:contentDescription="@string/send_google_spreadsheets"
-        android:src="@drawable/google_spreadsheets_icon"
-        style="@style/ChooseUploadServiceImageView" />
-      <CheckBox
-        android:id="@+id/choose_upload_service_spreadsheets"
-        android:text="@string/send_google_spreadsheets"
-        style="@style/ChooseUploadServiceCheckBox" />
-    </TableRow>
-  </TableLayout>
-</ScrollView>

MyTracks/res/layout/export.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
+  <RadioGroup
+    android:id="@+id/export_type_options"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:padding="8dp" >
+    <RadioButton
+      android:id="@+id/export_google_maps"
+      android:text="@string/export_google_maps"
+      style="@style/TextMedium" />
+    <RadioGroup
+      android:id="@+id/export_google_maps_options"
+      style="@style/ExportRadioGroup" >
+      <RadioButton
+        android:id="@+id/export_google_maps_public"
+        android:text="@string/export_google_maps_public"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/export_google_maps_unlisted"
+        android:text="@string/export_google_maps_unlisted"
+        style="@style/TextMedium" />
+    </RadioGroup>
+    <RadioButton
+      android:id="@+id/export_google_fusion_tables"
+      android:text="@string/export_google_fusion_tables"
+      style="@style/TextMedium" />
+    <RadioGroup
+      android:id="@+id/export_google_fusion_tables_options"
+      style="@style/ExportRadioGroup" >
+      <RadioButton
+        android:id="@+id/export_google_fusion_tables_public"
+        android:text="@string/export_google_fusion_tables_public"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/export_google_fusion_tables_private"
+        android:text="@string/export_google_fusion_tables_private"
+        style="@style/TextMedium" />
+    </RadioGroup>
+    <RadioButton
+      android:id="@+id/export_google_spreadsheets"
+      android:text="@string/export_google_spreadsheets"
+      style="@style/TextMedium" />
+    <RadioButton
+      android:id="@+id/export_external_storage"
+      android:text="@string/export_external_storage"
+      style="@style/TextMedium" />
+    <RadioGroup
+      android:id="@+id/export_external_storage_options"
+      style="@style/ExportRadioGroup" >
+      <RadioButton
+        android:id="@+id/export_external_storage_gpx"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/export_external_storage_kml"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/export_external_storage_csv"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/export_external_storage_tcx"
+        style="@style/TextMedium" />
+    </RadioGroup>
+  </RadioGroup>
+</ScrollView>

MyTracks/res/layout/upload_result.xml

@@ -42,10 +42,10 @@ limitations under the License.
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:text="@string/send_google_drive"
+          android:text="@string/export_google_drive"
           style="@style/TextMedium" />
         <TextView
-          android:text="@string/send_google_drive_url"
+          android:text="@string/export_google_drive_url"
           style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
@@ -70,10 +70,10 @@ limitations under the License.
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:text="@string/send_google_maps"
+          android:text="@string/export_google_maps"
           style="@style/TextMedium" />
         <TextView
-          android:text="@string/send_google_maps_url"
+          android:text="@string/export_google_maps_url"
           style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
@@ -98,10 +98,10 @@ limitations under the License.
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:text="@string/send_google_fusion_tables"
+          android:text="@string/export_google_fusion_tables"
           style="@style/TextMedium" />
         <TextView
-          android:text="@string/send_google_fusion_tables_url"
+          android:text="@string/export_google_fusion_tables_url"
           style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
@@ -126,10 +126,10 @@ limitations under the License.
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:text="@string/send_google_spreadsheets"
+          android:text="@string/export_google_spreadsheets"
           style="@style/TextMedium" />
         <TextView
-          android:text="@string/send_google_spreadsheets_url"
+          android:text="@string/export_google_spreadsheets_url"
           style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>

MyTracks/res/values/do_not_translate.xml

@@ -70,6 +70,10 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
 대표자: 염동훈\n
 주소 : 서울 강남구 역삼동 737 강남파이낸스센터 22층\n
 전화번호 : (02) 531-9000\n</string>
+  <string name="export_google_drive_url">drive.google.com</string>
+  <string name="export_google_fusion_tables_url">google.com/fusiontables</string>
+  <string name="export_google_maps_url">maps.google.com</string>
+  <string name="export_google_spreadsheets_url">drive.google.com</string>
   <string name="maps_public_unlisted_url">support.google.com/maps/bin/answer.py?answer=144365</string>
   <string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
   <string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
@@ -79,10 +83,6 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
   <string name="my_tracks_support_url">groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks</string>
   <string name="my_tracks_web_url">www.google.com/mobile/mytracks</string>
   <string name="permission_notification_value">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
-  <string name="send_google_drive_url">drive.google.com</string>
-  <string name="send_google_fusion_tables_url">google.com/fusiontables</string>
-  <string name="send_google_maps_url">maps.google.com</string>
-  <string name="send_google_spreadsheets_url">drive.google.com</string>
   <string name="sensor_type_value_ant">ANT</string>
   <string name="sensor_type_value_none">NONE</string>
   <string name="sensor_type_value_polar">POLAR</string>

MyTracks/res/values/keys.xml

@@ -25,19 +25,17 @@ limitations under the License.
   <string name="chart_show_power_key">chartShowPower</string>
   <string name="chart_show_speed_key">chartShowSpeed</string>
   <string name="default_activity_key">defaultActivity</string>
-  <string name="default_map_public_key">defaultMapPublic</string>
-  <string name="default_table_public_key">defaultTablePublic</string>
+  <string name="export_external_storage_format_key">exportExternalStorageFormat</string>
+  <string name="export_google_fusion_tables_public_key">exportGoogleFusionTablesPublic</string>
+  <string name="export_google_maps_public_key">exportGoogleMapsPublic</string>  
+  <string name="export_type_key">exportType</string>
   <string name="map_type_key">mapType</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
   <string name="metric_units_key">metricUnits</string>
   <string name="min_recording_distance_key">minRecordingDistance</string>
   <string name="min_recording_interval_key">minRecordingInterval</string>
   <string name="min_required_accuracy_key">minRequiredAccuracy</string>
-  <string name="pick_existing_map_key">pickExistingMap</string>
   <string name="report_speed_key">reportSpeed</string>
-  <string name="send_to_fusion_tables_key">sendToFusionTables</string>
-  <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>

MyTracks/res/values/strings.xml

@@ -612,6 +612,59 @@ limitations under the License.
     Terms of Service
   </string>
 
+  <!-- Export -->
+  <string name="export_external_storage"
+    translation_description="When exporting a track, the option to export to external storage.">
+    External storage
+  </string>
+  <string name="export_external_storage_option"
+    translation_description="When exporting a track to external storage, the option to export as a
+      certain file format.
+
+      %1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
+    as %1$s file
+  </string>
+  <string name="export_google_drive"
+    translation_description="When exporting a track, the option to export to Google Drive.">
+    Google Drive
+  </string>
+  <string name="export_google_fusion_tables"
+    translation_description="When exporting a track, the option to export to Google Fusion Tables.">
+    Google Fusion Tables
+  </string>
+  <string name="export_google_fusion_tables_private"
+    translation_description="When exporting a track to Google Fusion Tables, the option to export as
+      a new private table as opposed to a new public table.">
+    as new private table
+  </string>
+  <string name="export_google_fusion_tables_public"
+    translation_description="When exporting a trck to Google Fusion Tables, the option to export as
+      a new public table as opposed to a new private table.">
+    as new public table
+  </string>
+  <string name="export_google_maps"
+    translation_description="When exporting a track, the option to export to Google Maps.">
+    Google Maps
+  </string>
+  <string name="export_google_maps_public"
+    translation_description="When exporting a track to Google Maps, the option to export as a new
+      public map as opposed to a new unlisted map.">
+    as new public map
+  </string>
+  <string name="export_google_maps_unlisted"
+    translation_description="When sending a track to Google Maps, the option to export as a new
+      unlisted map as opposed to a new public map.">
+    as new unlisted map
+  </string>
+  <string name="export_google_spreadsheets"
+    translation_description="When exporting a track, the option to export to Google Spreadsheets.">
+    Google Spreadsheets
+  </string>
+  <string name="export_dialog_title"
+    translation_description="The dialog title when exporting a track.">
+    Export to&#8230;
+  </string>
+
   <!-- External Storage -->
   <string name="external_storage_not_available"
     translation_description="Error message when the external storage is not available.">
@@ -1299,50 +1352,11 @@ limitations under the License.
     translation_description="When sending to Google, the dialog title to choose a Google account.">
     Choose account
   </string>
-  <string name="send_google_drive"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
-      checkbox option to send to Google Drive.">
-    Google Drive
-  </string>
   <string name="send_google_error"
     translation_description="When sending a track to Google, a message indicating that an error has
       occurred and ask the user to try again.">
     An error has occurred. Please try again.
   </string>
-  <string name="send_google_existing_map"
-    translation_description="When sending a track to Google Maps, the radio option to use an
-      existing map as opposed to create a new map.">
-    Use existing map
-  </string>
-  <string name="send_google_fusion_tables"
-    translation_description="When sending a track to Google, the Google Fusion Tables name.">
-    Google Fusion Tables
-  </string>
-  <string name="send_google_fusion_tables_private"
-    translation_description="When sending a track to Google Fusion Tables, indicate a new private
-      table will get created.">
-    (new private table)
-  </string>
-  <string name="send_google_fusion_tables_public"
-    translation_description="When sending a track to Google Fusion Tables, indicate a new public
-      table will get created.">
-    (new public table)
-  </string>
-  <string name="send_google_maps"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
-      checkbox option to send to Google Maps.">
-    Google Maps
-  </string>
-  <string name="send_google_new_public_map"
-    translation_description="When sending a track to Google Maps, the radio option to create a new
-      public map as opposed to use an existing map.">
-    Create new public map
-  </string>
-  <string name="send_google_new_unlisted_map"
-    translation_description="When sending a track to Google Maps, the radio option to create a new
-      unlisted map as opposed to use an existing map.">
-    Create new unlisted map
-  </string>
   <string name="send_google_no_account_message"
     translation_description="When sending to Google, the dialog message when no Google account is
       found.">
@@ -1358,38 +1372,17 @@ limitations under the License.
       permission.">
     Not able to get account permission. Make sure network is available.
   </string>
-  <string name="send_google_no_service_selected"
-    translation_description="When sending a track to Google, a message indicating that the user has
-      not selected any Google service and no data is sent.">
-    You did not select any service. The track was not sent.
-  </string>
   <string name="send_google_progress_message"
     translation_description="When sending a track to a Google service, the progress message.
 
       %1$s: service name. 'Google Maps', 'Google Fusion Tables', or 'Google Spreadsheets'.">
     Sending to %1$s&#8230;
   </string>
-  <string name="send_google_send_now"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
-      button on the bottom to send the track to the selected Google services.">
-    Send now
-  </string>
-  <string name="send_google_spreadsheets"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
-      checkbox option to send to Google Spreadsheets.">
-    Google Spreadsheets
-  </string>
   <string name="send_google_success_footer"
     translation_description="When sending a track to Google, the additional comment on the bottom of
       the result page.">
     It may take a few minutes before new tracks appear.
   </string>
-  <string name="send_google_title"
-    translation_description="When sending a track to Google, the dialog title to choose the Google
-      services to send the track to. The user can choose Google Maps, Google Fusion Tables, and
-      Google Spreadsheets.">
-    Send to&#8230;
-  </string>
   <string name="send_google_track_part_label"
     translation_description="When sending a track to Google, the label to name segments of a large
       track. E.g., 'track_name (Part 1)'.
@@ -1632,51 +1625,6 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Sync Google Drive
   </string>
-  <string name="settings_google_fusion_tables_public_summary_off"
-    translation_description="In the 'Google' settings, the summary for the 'New tables public'
-      checkbox when it is unchecked explaining that new tables created in Google Fusion Tables will
-      be private, instead of public.">
-    New tables created in Google Fusion Tables will be private, instead of public.
-  </string>
-  <string name="settings_google_fusion_tables_public_summary_on"
-    translation_description="In the 'Google' settings, the summary for the 'New tables public'
-      checkbox when it is checked explaining that new tables created in Google Fusion Tables will be
-      public, instead of private.">
-    New tables created in Google Fusion Tables will be public, instead of private.
-  </string>
-  <string name="settings_google_fusion_tables_public_title"
-    translation_description="In the 'Google' settings, the checkbox to make new tables created in
-      Google Fusion Tables public instead of private.
-
-      Character limit: ~23 (1 line)">
-    New tables public
-  </string>
-  <string name="settings_google_maps_public_summary_off"
-    translation_description="In the 'Google' settings, the summary for the 'New maps public'
-      checkbox when it is unchecked explaining that new maps created in Google Maps will be
-      unlisted, instead of public. See http://support.google.com/maps/bin/answer.py?answer=144365
-      for public versus unlisted.
-
-      %1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
-    New maps created in Google Maps will be unlisted, instead of public. See %1$s for more info.
-  </string>
-  <string name="settings_google_maps_public_summary_on"
-    translation_description="In the 'Google' settings, the summary for the 'New maps public'
-      checkbox when it is checked explaining that new maps created in Google Maps will be public,
-      instead of unlisted. See http://support.google.com/maps/bin/answer.py?answer=144365 for public
-      versus unlisted.
-
-      %1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
-    New maps created in Google Maps will be public, instead of unlisted. See %1$s for more info.
-  </string>
-  <string name="settings_google_maps_public_title"
-    translation_description="In the 'Google' settings, the checkbox to make new maps created in
-      Google Maps public instead of unlisted. See
-      http://support.google.com/maps/bin/answer.py?answer=144365 for public versus unlisted.
-
-      Character limit: ~23 (1 line)">
-    New maps public
-  </string>
 
   <!-- Settings Map -->
   <string name="settings_map_medium"
@@ -2207,7 +2155,7 @@ limitations under the License.
     translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
       the horizontal, also known as slope or incline.">
     Grade
-  </string>  
+  </string>
   <string name="stats_latitude"
     translation_description="In the 'Stats' page, the latitude.">
     Latitude

MyTracks/res/values/styles.xml

@@ -32,19 +32,6 @@ limitations under the License.
     <item name="android:layout_width">match_parent</item>
     <item name="android:orientation">horizontal</item>
   </style>
-  <!-- choose upload service checkbox -->
-  <style name="ChooseUploadServiceCheckBox" parent="@style/TextMedium">
-    <item name="android:layout_gravity">center_vertical</item>
-    <item name="android:layout_marginLeft">8dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:maxLines">5</item>
-  </style>
-  <!-- choose upload service image view -->
-  <style name="ChooseUploadServiceImageView">
-    <item name="android:layout_gravity">center</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
   <!-- edit category -->
   <style name="EditCategory" parent="@style/TextMedium">
     <item name="android:layout_width">match_parent</item>
@@ -85,6 +72,12 @@ limitations under the License.
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
   </style>
+  <!-- export radio group -->
+  <style name="ExportRadioGroup">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginLeft">16dp</item>
+    <item name="android:layout_width">match_parent</item>
+  </style> 
   <!-- help answer -->
   <style name="HelpAnswer" parent="@style/TextSmall">
     <item name="android:autoLink">web</item>

MyTracks/res/xml/google_settings.xml

@@ -24,14 +24,4 @@ limitations under the License.
     android:defaultValue="false"
     android:key="@string/drive_sync_key"
     android:title="@string/settings_google_drive_sync_title" />
-  <CheckBoxPreference
-    android:defaultValue="false"
-    android:key="@string/default_map_public_key"
-    android:title="@string/settings_google_maps_public_title" />
-  <CheckBoxPreference
-    android:defaultValue="false"
-    android:key="@string/default_table_public_key"
-    android:summaryOff="@string/settings_google_fusion_tables_public_summary_off"
-    android:summaryOn="@string/settings_google_fusion_tables_public_summary_on"
-    android:title="@string/settings_google_fusion_tables_public_title" />
 </PreferenceScreen>