Add

- Switch Account
- Sync Google Drive
- New maps public

under the Google settings.

MyTracks/res/values/arrays_do_not_translate.xml

@@ -160,7 +160,7 @@ limitations under the License.
     <item>5000</item>
   </string-array>
   <string-array name="sensor_type_all_options">
-    <item>@string/settings_sensor_type_none</item>
+    <item>@string/value_none</item>
     <item>@string/settings_sensor_type_ant</item>
     <item>@string/settings_sensor_type_polar</item>
     <item>@string/settings_sensor_type_zephyr</item>
@@ -172,7 +172,7 @@ limitations under the License.
     <item>@string/sensor_type_value_zephyr</item>
   </string-array>
   <string-array name="sensor_type_bluetooth_options">
-    <item>@string/settings_sensor_type_none</item>
+    <item>@string/value_none</item>
     <item>@string/settings_sensor_type_polar</item>
     <item>@string/settings_sensor_type_zephyr</item>
   </string-array>

MyTracks/res/values/keys.xml

@@ -30,8 +30,9 @@ 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="google_account_key">googleAccount</string>
+  <string name="google_settings_account_key">googleSettingsAccount</string>
+  <string name="google_settings_drive_sync_key">googleSettingsDriveSync</string>
+  <string name="google_settings_maps_public_key">googleSettingsMapsPublic</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
   <string name="metric_units_key">metricUnits</string>
   <string name="min_recording_distance_key">minRecordingDistance</string>
@@ -60,7 +61,7 @@ limitations under the License.
   <string name="track_widget_item3">trackWidgetItem3</string>
   <string name="track_widget_item4">trackWidgetItem4</string>
   <string name="voice_frequency_key">voiceFrequency</string>
-        
+
   <!-- Keys for persistend preferences. But they should not get backed up or restored. -->
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
   <string name="recording_track_id_key">recordingTrackId</string>
@@ -68,6 +69,7 @@ limitations under the License.
   <string name="selected_track_id_key">selectedTrackId</string>
 
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
+  <string name="google_settings_key">googleSettings</string>
   <string name="settings_backup_key">settingsBackup</string>
   <string name="settings_backup_now_key">settingsBackupNow</string>
   <string name="settings_backup_restore_key">settingsBackupRestore</string>

MyTracks/res/values/strings.xml

@@ -719,6 +719,61 @@ limitations under the License.
     Success
   </string>
 
+  <!-- Google Settings -->
+  <string name="google_settings_title"
+    translation_description="In the 'Settings' page, the option to change the Google settings.
+
+      Character limit: ~23 (1 line)">
+    Google
+  </string>
+  <string name="google_settings_account_title"
+    translation_description="In the 'Google' settings, the option to switch Google account.
+
+      Character limit: ~23 (1 line)">
+    Switch account
+  </string>
+  <string name="google_settings_drive_sync_title"
+    translation_description="In the 'Google' settings, the checkbox to sync tracks with Google
+      Drive.
+
+      Character limit: ~23 (1 line)">
+    Sync Google Drive
+  </string>
+  <string name="google_settings_drive_sync_summary_on"
+    translation_description="In the 'Google' settings, the summary for the 'Sync Google Drive'
+      checkbox when it is checked explaining that all tracks will be synced to a Google Drive
+      account.
+
+      %1$s account name. E.g., 'foo@foo.com'.">
+    All tracks will be synced to %1$s Google Drive
+  </string>
+  <string name="google_settings_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>
+  <string name="google_settings_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="google_settings_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>
+
   <!-- Gps -->
   <string name="gps_google_location_settings"
      translation_description="In Android, the Google location settings to modify location settings
@@ -1593,12 +1648,6 @@ limitations under the License.
       Character limit: ~26 (1 line)">
     Show
   </string>
-  <string name="settings_switch_account"
-    translation_description="In the 'Settings' page, the option to switch account.
-
-      Character limit: ~26 (1 line)">
-    Switch account
-  </string>
 
   <!-- Settings Backup -->
   <string name="settings_backup"
@@ -2029,13 +2078,6 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     ANT+
   </string>
-  <string name="settings_sensor_type_none"
-    translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
-      not connect to any sensor.
-
-      Character limit: ~20 (1 line)">
-    None
-  </string>
   <string name="settings_sensor_type_polar"
     translation_description="In the 'Sensor' settings, for the 'Sensor type' dropdown, the option to
       connect to a Polar bluetooth sensor. Do not translate Polar, the company name, but can
@@ -2093,32 +2135,6 @@ limitations under the License.
       Tracks data.">
     Other apps can read, write, start/stop recording My Tracks data.
   </string>
-  <string name="settings_sharing_new_map_public"
-    translation_description="In the 'Sharing' settings, the checkbox option 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>
-  <string name="settings_sharing_new_map_public_summary_off"
-    translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
-      checkbox option 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_sharing_new_map_public_summary_on"
-    translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
-      checkbox option 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>
 
   <!-- Settings Stats -->
   <string name="settings_stats_coordinate"
@@ -2632,6 +2648,10 @@ limitations under the License.
     translation_description="In a setting picker, the value to never use the feature.">
     Never
   </string>
+  <string name="value_none"
+    translation_description="In a setting picker, the value to pick none of the options.">
+    None
+  </string>
   <string name="value_off"
     translation_description="In a setting picker, the value to turn off the feature.">
     Off