Place sharing settings in ShareSettingsActivity to support

ICS up navigation in the action bar.

MyTracks/res/values/keys.xml

@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
-  <!-- Keys for persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
+  <!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="allow_access_key">allowAccess</string>
   <string name="announcement_frequency_key">announcementFrequency</string>
   <string name="ant_cadence_sensor_id_key">antCadenceSensorId</string>
@@ -51,7 +50,7 @@ limitations under the License.
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
   <string name="stats_show_elevation_key">statsShowElevation</string>
   <string name="stats_show_grade_key">statsShowGrade</string>
-  <string name="stats_show_total_time_key">statsShowTotalTime</string>    
+  <string name="stats_show_total_time_key">statsShowTotalTime</string>
   <string name="track_color_mode_dynamic_speed_variation_key">trackColorModeDynamicVariation</string>
   <string name="track_color_mode_fixed_speed_medium_display_key">trackColorModeFixedMediumDisplay</string>
   <string name="track_color_mode_fixed_speed_medium_key">trackColorModeFixedMedium</string>
@@ -60,11 +59,12 @@ limitations under the License.
   <string name="track_color_mode_key">trackColorMode</string>
   <string name="track_name_key">trackName</string>
 
-  <!-- Keys for non-persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
+  <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="ant_options_key">antOptions</string>
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="reset_key">resetToDefaults</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
   <string name="sensor_options_key">sensorOptions</string>
+  <string name="settings_sharing_key">settingsSharing</string>
   <string name="track_color_mode_fixed_speed_options_key">trackColorModeFixedOptions</string>
 </resources>

MyTracks/res/values/strings.xml

@@ -2040,10 +2040,6 @@ limitations under the License.
       sharing a URL with friends.">
    Remove any descriptive text when sharing a URL with friends.
   </string>
-  <string name="settings_title"
-    translation_description="The title of the 'Settings' page.">
-    My Tracks settings
-  </string>
 
   <!-- Share Track -->
   <string name="share_track_file_body_format"

MyTracks/res/xml/preferences.xml

@@ -14,8 +14,8 @@ 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.
 -->
-<PreferenceScreen
-  xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+  android:title="@string/menu_settings">
 
   <!-- Display settings -->
   <PreferenceScreen android:title="@string/settings_display">
@@ -152,6 +152,12 @@ limitations under the License.
 
   </PreferenceScreen>
 
+  <!-- Sharing -->
+  <Preference
+      android:title="@string/settings_sharing"
+      android:key="@string/settings_sharing_key"
+      android:persistent="false" />
+
   <!-- Sensors -->
   <PreferenceScreen android:title="@string/settings_sensor"
       android:key="@string/sensor_options_key">
@@ -186,30 +192,6 @@ limitations under the License.
     </PreferenceCategory>
   </PreferenceScreen>
 
-  <!-- Sharing settings -->
-  <PreferenceScreen android:title="@string/settings_sharing">
-    <CheckBoxPreference
-        android:key="@string/default_map_public_key"
-        android:title="@string/settings_sharing_map_public"
-        android:summaryOn="@string/settings_sharing_map_public_summary_on"
-        android:summaryOff="@string/settings_sharing_map_public_summary_off"
-        android:defaultValue="true" />
-
-    <CheckBoxPreference
-        android:key="@string/share_url_only_key"
-        android:title="@string/settings_sharing_url_only"
-        android:summaryOn="@string/settings_sharing_url_only_summary_on"
-        android:summaryOff="@string/settings_sharing_url_only_summary_off"
-        android:defaultValue="false" />
-
-    <CheckBoxPreference
-        android:key="@string/allow_access_key"
-        android:title="@string/settings_sharing_allow_access"
-        android:summaryOn="@string/settings_sharing_allow_access_summary_on"
-        android:summaryOff="@string/settings_sharing_allow_access_summary_off"
-        android:defaultValue="false" />
-  </PreferenceScreen>
-
   <!-- Backup settings -->
   <PreferenceScreen android:title="@string/settings_backup">
     <PreferenceCategory android:title="@string/settings_backup_sd_card">

MyTracks/res/xml/sharing_settings.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 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.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+  android:title="@string/settings_sharing" >
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:key="@string/default_map_public_key"
+    android:summaryOff="@string/settings_sharing_map_public_summary_off"
+    android:summaryOn="@string/settings_sharing_map_public_summary_on"
+    android:title="@string/settings_sharing_map_public" />
+  <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="@string/share_url_only_key"
+    android:summaryOff="@string/settings_sharing_url_only_summary_off"
+    android:summaryOn="@string/settings_sharing_url_only_summary_on"
+    android:title="@string/settings_sharing_url_only" />
+  <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="@string/allow_access_key"
+    android:summaryOff="@string/settings_sharing_allow_access_summary_off"
+    android:summaryOn="@string/settings_sharing_allow_access_summary_on"
+    android:title="@string/settings_sharing_allow_access" />
+</PreferenceScreen>