Move chart settings to ChartSettingsActivity.

MyTracks/res/layout/chart_settings.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2009 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" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <TextView
-      android:drawableLeft="@drawable/x_axis"
-      android:text="@string/chart_settings_x_axis"
-      style="@style/TextLarge.WithIcon" />
-    <RadioGroup
-      android:id="@+id/chart_settings_x"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content" >
-      <RadioButton
-        android:id="@+id/chart_settings_by_distance"
-        android:text="@string/chart_settings_by_distance"
-        style="@style/TextMedium" />
-      <RadioButton
-        android:id="@+id/chart_settings_by_time"
-        android:text="@string/chart_settings_by_time"
-        style="@style/TextMedium" />
-    </RadioGroup>
-    <TextView
-      android:drawableLeft="@drawable/y_axis"
-      android:text="@string/chart_settings_y_axis"
-      style="@style/TextLarge.WithIcon" />
-    <CheckBox
-      android:id="@+id/chart_settings_elevation"
-      android:text="@string/stats_elevation"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_speed"
-      android:text="@string/stats_speed"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_power"
-      android:text="@string/sensor_state_power"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_cadence"
-      android:text="@string/sensor_state_cadence"
-      style="@style/TextMedium" />
-    <CheckBox
-      android:id="@+id/chart_settings_heart_rate"
-      android:text="@string/sensor_state_heart_rate"
-      style="@style/TextMedium" />
-  </LinearLayout>
-</ScrollView>

MyTracks/res/menu/track_detail.xml

@@ -84,10 +84,6 @@ limitations under the License.
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
     android:title="@string/menu_sensor_state"/>
-  <item
-    android:icon="@drawable/menu_chart_settings"
-    android:id="@+id/track_detail_chart_settings"
-    android:title="@string/menu_chart_settings"/>
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_detail_settings"

MyTracks/res/values/keys.xml

@@ -25,6 +25,12 @@ limitations under the License.
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
   <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
   <string name="bluetooth_sensor_key">bluetoothSensor</string>
+  <string name="chart_by_distance_key">chartByDistance</string>
+  <string name="chart_show_cadence_key">chartShowCadence</string>
+  <string name="chart_show_elevation_key">chartShowElevation</string>
+  <string name="chart_show_heart_rate_key">chartShowHeartRate</string>
+  <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="max_recording_distance_key">maxRecordingDistance</string>
@@ -55,11 +61,11 @@ limitations under the License.
   <string name="track_color_mode_slow_key">trackColorModeSlow</string>
   <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. -->
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
   <string name="settings_backup_key">settingsBackup</string>
+  <string name="settings_chart_key">settingsChart</string>
   <string name="settings_map_key">settingsMap</string>
   <string name="settings_map_medium_display_key">settingsMapMediumDisplay</string>
   <string name="settings_map_percentage_display_key">settingsMapPercentageDisplay</string>

MyTracks/res/values/strings.xml

@@ -416,30 +416,6 @@ limitations under the License.
     Record and share your GPS tracks with My Tracks.
   </string>
 
-  <!-- Chart Settings -->
-  <string name="chart_settings_by_distance"
-    translation_description="In the 'Chart settings' dialog, under the 'X axis' section, the radio
-      option to show the charts by distance. The other radio option is to show by time. User can
-      only choose one of the options.">
-    By distance
-  </string>
-  <string name="chart_settings_by_time"
-    translation_description="In the 'Chart settings' dialog, under the 'X axis' section, the radio
-      option to show the charts by time. The other radio option is to show by distance. User can
-      only choose one of the options.">
-    By time
-  </string>
-  <string name="chart_settings_x_axis"
-    translation_description="In the 'Chart settings' dialog, the section label for configuring the X
-      axis.">
-    X axis
-  </string>
-  <string name="chart_settings_y_axis"
-    translation_description="In the 'Chart settings' dialog, the section label for configuring the Y
-      axis.">
-    Y axis
-  </string>
-
   <!-- Description -->
   <string name="description_activity_type"
     translation_description="Activity type description.
@@ -1034,10 +1010,6 @@ limitations under the License.
     translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated statistics
   </string>
-  <string name="menu_chart_settings"
-    translation_description="In the menu, to change the chart settings.">
-    Chart settings
-  </string>
   <string name="menu_delete_all"
     translation_description="In the menu, to delete all the tracks.">
     Delete all
@@ -1521,6 +1493,22 @@ limitations under the License.
     Restore all tracks and settings from the SD card.
   </string>
 
+  <!-- Settings Chart -->
+  <string name="settings_chart_by_distance"
+    translation_description="In the 'Chart' settings, the option to display the x axis by
+      distance.">
+    By distance
+  </string>  
+  <string name="settings_chart_by_time"
+    translation_description="In the 'Chart' settings, the option to display the x axis by time.">
+    By time
+  </string>
+  <string name="settings_chart_x_axis"
+    translation_description="In the 'Chart' setttings, the option to change the x axis display,
+      either by distance or by time.">
+    X axis
+  </string>
+
   <!-- Settings Map -->
   <string name="settings_map_medium"
     translation_description="In the 'Map' settings, under the 'Fixed thresholds' configurations, the
@@ -1574,6 +1562,10 @@ limitations under the License.
   </string>
 
   <!-- Settings Others -->
+  <string name="settings_show"
+    translation_description="In settings, the section label to show additional values.">
+    Show
+  </string>
   <string name="settings_not_while_recording"
     translation_description="In settings, the summary for an option that is not available during a
       track recording.">
@@ -1986,10 +1978,6 @@ limitations under the License.
       either speed (mi/hr) or pace (hr/mi).">
     Preferred Rate
   </string>
-  <string name="settings_stats_show"
-    translation_description="In the 'Stats' settings, the section label to show additional stats.">
-    Show
-  </string>
   <string name="settings_stats_time_title"
     translation_description="In the 'Stats' settings, the option to change the time measurement,
       either total time or moving time.">

MyTracks/res/xml/chart_settings.xml

@@ -0,0 +1,46 @@
+<?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/track_detail_chart_tab" >
+  <CheckBoxPreference
+    android:defaultValue="true"
+    android:key="@string/chart_by_distance_key"
+    android:summaryOff="@string/settings_chart_by_time"
+    android:summaryOn="@string/settings_chart_by_distance"
+    android:title="@string/settings_chart_x_axis" />
+  <PreferenceCategory android:title="@string/settings_show" >
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_elevation_key"
+      android:title="@string/stats_elevation" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_speed_key" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_heart_rate_key"
+      android:title="@string/sensor_state_heart_rate" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_cadence_key"
+      android:title="@string/sensor_state_cadence" />
+    <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="@string/chart_show_power_key"
+      android:title="@string/sensor_state_power" />
+  </PreferenceCategory>
+</PreferenceScreen>

MyTracks/res/xml/settings.xml

@@ -20,6 +20,10 @@ limitations under the License.
     android:key="@string/settings_map_key"
     android:persistent="false"
     android:title="@string/track_detail_map_tab" />
+  <Preference
+    android:key="@string/settings_chart_key"
+    android:persistent="false"
+    android:title="@string/track_detail_chart_tab" />
   <Preference
     android:key="@string/settings_stats_key"
     android:persistent="false"

MyTracks/res/xml/stats_settings.xml

@@ -32,7 +32,7 @@ limitations under the License.
     android:summaryOff="@string/stats_total_time"
     android:summaryOn="@string/stats_moving_time"
     android:title="@string/settings_stats_time_title" />
-  <PreferenceCategory android:title="@string/settings_stats_show" >
+  <PreferenceCategory android:title="@string/settings_show" >
     <CheckBoxPreference
       android:defaultValue="false"
       android:key="@string/stats_show_elevation_key"