Move "Switch Account" to the top level settings.

MyTracks/res/values/keys.xml

@@ -31,6 +31,7 @@ limitations under the License.
   <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="max_recording_distance_key">maxRecordingDistance</string>
   <string name="metric_units_key">metricUnits</string>
   <string name="min_recording_distance_key">minRecordingDistance</string>
@@ -44,7 +45,6 @@ limitations under the License.
   <string name="send_to_fusion_tables_key">sendToFusionTables</string>
   <string name="send_to_maps_key">sendToMaps</string>
   <string name="sensor_type_key">sensorType</string>
-  <string name="sharing_account_key">sharingAccount</string>
   <string name="show_check_units_dialog_key">showCheckUnitsDialog</string>
   <string name="show_welcome_dialog_key">showWelcomeDialog</string>
   <string name="split_frequency_key">splitFrequency</string>

MyTracks/res/values/strings.xml

@@ -1800,14 +1800,6 @@ limitations under the License.
       Character limit: ~26 (1 line)">
     Sharing
   </string>
-  <string name="settings_sharing_account"
-    translation_description="In the 'Sharing' settings, the option to switch account.">
-    Switch account
-  </string>
-  <string name="settings_sharing_account_summary"
-    translation_description="In the 'Sharing' settings, the summary for 'Switch account'.">
-    Account used when sending a track to Google.
-  </string>
   <string name="settings_sharing_allow_access"
     translation_description="In the 'Sharing' settings, the checkbox option to allow third party
       apps access to the My Tracks data.
@@ -1912,6 +1904,12 @@ limitations under the License.
     Preferred units
   </string>
 
+  <!--  Settings Switch Account -->
+  <string name="settings_switch_account"
+    translation_description="In the 'Settings' page, the option to switch account.">
+    Switch account
+  </string>
+
   <!-- Settings Voice -->
   <string name="settings_voice_frequency_title"
     translation_description="The title of the 'Voice frequency' dialog.">

MyTracks/res/xml/settings.xml

@@ -44,6 +44,10 @@ limitations under the License.
     android:key="@string/settings_backup_key"
     android:persistent="false"
     android:title="@string/settings_backup" />
+  <ListPreference
+    android:defaultValue=""
+    android:key="@string/google_account_key"
+    android:title="@string/settings_switch_account" />
   <Preference
     android:key="@string/settings_reset_key"
     android:persistent="false"

MyTracks/res/xml/sharing_settings.xml

@@ -16,11 +16,6 @@ limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_sharing" >
-  <ListPreference
-    android:defaultValue=""
-    android:key="@string/sharing_account_key"
-    android:summary="@string/settings_sharing_account_summary"
-    android:title="@string/settings_sharing_account" />
   <CheckBoxPreference
     android:defaultValue="false"
     android:key="@string/default_map_public_key"