forked from upstream-mirrors/OpenTracks
Move Stats settings to StatsSettingsActivity.
This commit is contained in:
Jimmy Shih
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,56 +0,0 @@
|
||||
<?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.
|
||||
-->
|
||||
<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:text="@string/stats_settings_time"
|
||||
style="@style/TextLarge" />
|
||||
<RadioGroup
|
||||
android:id="@+id/stats_settings_time"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content" >
|
||||
<RadioButton
|
||||
android:id="@+id/stats_settings_total_time"
|
||||
android:text="@string/stats_total_time"
|
||||
style="@style/TextMedium" />
|
||||
<RadioButton
|
||||
android:id="@+id/stats_settings_moving_time"
|
||||
android:text="@string/stats_moving_time"
|
||||
style="@style/TextMedium" />
|
||||
</RadioGroup>
|
||||
<TextView
|
||||
android:text="@string/stats_settings_show"
|
||||
style="@style/TextLarge" />
|
||||
<CheckBox
|
||||
android:id="@+id/stats_settings_elevation"
|
||||
android:text="@string/stats_elevation"
|
||||
style="@style/TextMedium" />
|
||||
<CheckBox
|
||||
android:id="@+id/stats_settings_grade"
|
||||
android:text="@string/stats_settings_grade"
|
||||
style="@style/TextMedium" />
|
||||
<CheckBox
|
||||
android:id="@+id/stats_settings_coordinate"
|
||||
android:text="@string/stats_settings_coordinate"
|
||||
style="@style/TextMedium" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
@@ -88,10 +88,6 @@ limitations under the License.
|
||||
android:icon="@drawable/menu_chart_settings"
|
||||
android:id="@+id/track_detail_chart_settings"
|
||||
android:title="@string/menu_chart_settings"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_stats_settings"
|
||||
android:id="@+id/track_detail_stats_settings"
|
||||
android:title="@string/menu_stats_settings"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_settings"
|
||||
android:id="@+id/track_detail_settings"
|
||||
|
||||
@@ -49,7 +49,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_use_total_time_key">statsUseTotalTime</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>
|
||||
@@ -70,5 +70,6 @@ limitations under the License.
|
||||
<string name="settings_sensor_bluetooth_pairing_key">settingsSensorBluetoothPairing</string>
|
||||
<string name="settings_sensor_root_key">settingsSensorRoot</string>
|
||||
<string name="settings_sharing_key">settingsSharing</string>
|
||||
<string name="settings_stats_key">settingsStats</string>
|
||||
<string name="track_color_mode_fixed_speed_options_key">trackColorModeFixedOptions</string>
|
||||
</resources>
|
||||
@@ -1141,10 +1141,6 @@ limitations under the License.
|
||||
translation_description="In the menu, to show a marker on map.">
|
||||
Show on map
|
||||
</string>
|
||||
<string name="menu_stats_settings"
|
||||
translation_description="In the menu, to change the stats settings.">
|
||||
Stats settings
|
||||
</string>
|
||||
<string name="menu_stop_recording"
|
||||
translation_description="In the menu, to stop recording a track.">
|
||||
Stop recording
|
||||
@@ -1213,23 +1209,6 @@ limitations under the License.
|
||||
write data to My Tracks and start/stop My Tracks recording
|
||||
</string>
|
||||
|
||||
<!-- Preferred Units -->
|
||||
<string name="preferred_units_imperial"
|
||||
translation_description="In the dialog asking the user to choose a preferred units, the option
|
||||
to choose the imperial units.">
|
||||
Imperial (mi, ft)
|
||||
</string>
|
||||
<string name="preferred_units_metric"
|
||||
translation_description="In the dialog asking the user to choose a preferred units, the option
|
||||
to choose the metric units.">
|
||||
Metric (km, m)
|
||||
</string>
|
||||
<string name="preferred_units_title"
|
||||
translation_description="The title of the dialog asking the user to choose a preferred units,
|
||||
metric or imperial.">
|
||||
Preferred Units
|
||||
</string>
|
||||
|
||||
<!-- Save All -->
|
||||
<string name="save_all_error"
|
||||
translation_description="When saving all the tracks to the SD card, a toast message indicating
|
||||
@@ -1480,7 +1459,7 @@ limitations under the License.
|
||||
Sending
|
||||
</string>
|
||||
|
||||
<!-- Settings -->
|
||||
<!-- Settings Backup -->
|
||||
<string name="settings_backup"
|
||||
translation_description="In the 'Settings' page, the option to change the data backup related
|
||||
settings.
|
||||
@@ -1541,6 +1520,8 @@ limitations under the License.
|
||||
the SD card.">
|
||||
Restore all tracks and settings from the SD card.
|
||||
</string>
|
||||
|
||||
<!-- Settings Display -->
|
||||
<string name="settings_display"
|
||||
translation_description="In the 'Settings' page, the option to change the display related
|
||||
settings.
|
||||
@@ -1548,41 +1529,6 @@ limitations under the License.
|
||||
Character limit: ~26 (1 line)">
|
||||
Display
|
||||
</string>
|
||||
<string name="settings_display_metric"
|
||||
translation_description="In the 'Display' settings, the checkbox option to use the metric units.
|
||||
|
||||
Character limit: ~23 (1 line)">
|
||||
Use metric
|
||||
</string>
|
||||
<string name="settings_display_metric_summary_off"
|
||||
translation_description="In the 'Display' settings, the summary for the 'Use metric'
|
||||
checkbox when it is unchecked explaining using the imperial units to display distances.">
|
||||
Use imperial units to display distances.
|
||||
</string>
|
||||
<string name="settings_display_metric_summary_on"
|
||||
translation_description="In the 'Display' settings, the summary for the 'Use metric'
|
||||
checkbox when it is checked explaining using the metric units to display distances.">
|
||||
Use metric units to display distances.
|
||||
</string>
|
||||
<string name="settings_display_speed"
|
||||
translation_description="In the 'Display' settings, the checkbox option to display speed (e.g.,
|
||||
5 miles per hour) instead of pace (e.g., 0.2 hours per mile).
|
||||
|
||||
Character limit: ~23 (1 line)">
|
||||
Display speed
|
||||
</string>
|
||||
<string name="settings_display_speed_summary_off"
|
||||
translation_description="In the 'Display' settings, the summary for the 'Display speed' checkbox
|
||||
when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
|
||||
speed (e.g., 5 miles per hour).">
|
||||
Display pace (e.g., hours/mile).
|
||||
</string>
|
||||
<string name="settings_display_speed_summary_on"
|
||||
translation_description="In the 'Display' settings, the summary for the 'Display speed' checkbox
|
||||
when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
|
||||
(e.g., 0.2 hours per mile).">
|
||||
Display speed (e.g., miles/hour).
|
||||
</string>
|
||||
<string name="settings_display_track_color"
|
||||
translation_description="In the 'Display' settings, the dropdown option to choose a track color
|
||||
mode for how to use different colors to color a track based on slow, medium, and fast speed.
|
||||
@@ -1670,6 +1616,8 @@ limitations under the License.
|
||||
track recording.">
|
||||
Not available while recording a track.
|
||||
</string>
|
||||
|
||||
<!-- Settings Recording -->
|
||||
<string name="settings_recording"
|
||||
translation_description="In the 'Settings' page, the option to change the track recording
|
||||
related settings.
|
||||
@@ -1815,6 +1763,8 @@ limitations under the License.
|
||||
announcements.">
|
||||
Time/distance between two voice announcements.
|
||||
</string>
|
||||
|
||||
<!-- Settings Reset -->
|
||||
<string name="settings_reset"
|
||||
translation_description="In the 'Settings' page, the option to reset everything to the defaults.
|
||||
|
||||
@@ -1838,6 +1788,8 @@ limitations under the License.
|
||||
explaining reverting all the settings to the default values.">
|
||||
Revert all your settings to the default values.
|
||||
</string>
|
||||
|
||||
<!-- Settings Sensor -->
|
||||
<string name="settings_sensor"
|
||||
translation_description="In the 'Settings' page, the option to change the sensor related
|
||||
settings.
|
||||
@@ -1961,6 +1913,8 @@ limitations under the License.
|
||||
Character limit: ~26 (1 line)">
|
||||
Unpair SRM ANT+ bridge
|
||||
</string>
|
||||
|
||||
<!-- Settings Sharing -->
|
||||
<string name="settings_sharing"
|
||||
translation_description="In the 'Settings' page, the option to change the track sharing related
|
||||
settings.
|
||||
@@ -2034,6 +1988,66 @@ limitations under the License.
|
||||
Remove any descriptive text when sharing a URL with friends.
|
||||
</string>
|
||||
|
||||
<!-- Settings Stats -->
|
||||
<string name="settings_stats_coordinate"
|
||||
translation_description="In the 'Stats settings, the option to show latitude and longitude.">
|
||||
Latitude/Longitude
|
||||
</string>
|
||||
<string name="settings_stats_grade"
|
||||
translation_description="In the 'Stats settings, the option to show grade. Grade is the amount
|
||||
of inclination to the horizontal, also known as slope or incline.">
|
||||
Grade
|
||||
</string>
|
||||
<string name="settings_stats_rate_pace_imperial"
|
||||
translation_description="In the 'Stats' settings, the option to display pace, with example in
|
||||
imperial units.">
|
||||
Pace (hr/mi).
|
||||
</string>
|
||||
<string name="settings_stats_rate_pace_metric"
|
||||
translation_description="In the 'Stats' settings, the option to display pace, with example in
|
||||
metric units.">
|
||||
Pace (hr/km).
|
||||
</string>
|
||||
<string name="settings_stats_rate_speed_imperial"
|
||||
translation_description="In the 'Stats' settings, the option to display speed, with example in
|
||||
imperial units.">
|
||||
Speed (mi/hr)
|
||||
</string>
|
||||
<string name="settings_stats_rate_speed_metric"
|
||||
translation_description="In the 'Stats' settings, the option to display speed, with example in
|
||||
metric units.">
|
||||
Speed (km/hr)
|
||||
</string>
|
||||
<string name="settings_stats_rate_title"
|
||||
translation_description="In the 'Stats' settings, the option to change the preferred rate,
|
||||
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.">
|
||||
Time Measurement
|
||||
</string>
|
||||
<string name="settings_stats_units_imperial"
|
||||
translation_description="In the 'Stats' setttings, the option to use imperial units, with
|
||||
examples.">
|
||||
Imperial (mi, ft)
|
||||
</string>
|
||||
<string name="settings_stats_units_metric"
|
||||
translation_description="In the 'Stats' settings, the option to use metric units, with
|
||||
examples.">
|
||||
Metric (km, m)
|
||||
</string>
|
||||
<string name="settings_stats_units_title"
|
||||
translation_description="In the 'Stats' settings page, the option to change the preferred units,
|
||||
either metric (km) or imperial (mi).">
|
||||
Preferred Units
|
||||
</string>
|
||||
|
||||
<!-- Share Track -->
|
||||
<string name="share_track_file_body_format"
|
||||
translation_description="When sharing a track file with friends, the body of the message.">
|
||||
@@ -2134,28 +2148,6 @@ limitations under the License.
|
||||
Total time
|
||||
</string>
|
||||
|
||||
<!-- Stats Settings -->
|
||||
<string name="stats_settings_show"
|
||||
translation_description="In the 'Stats settings' dialog, the section label to show additional
|
||||
stats.">
|
||||
Show
|
||||
</string>
|
||||
<string name="stats_settings_grade"
|
||||
translation_description="In the 'Stats settings' dialog, the option to show grade. Grade is
|
||||
the amount of inclination to the horizontal, also known as slope or incline.">
|
||||
Grade
|
||||
</string>
|
||||
<string name="stats_settings_coordinate"
|
||||
translation_description="In the 'Stats settings' dialog, the option to show latitude and
|
||||
longitude.">
|
||||
Latitude/Longitude
|
||||
</string>
|
||||
<string name="stats_settings_time"
|
||||
translation_description="In the 'Stats settings' dialog, the section label to choose between
|
||||
displaying total time or moving time.">
|
||||
Time
|
||||
</string>
|
||||
|
||||
<!-- Track -->
|
||||
<string name="track_detail_chart_tab"
|
||||
translation_description="In the track detail page, the title of the tab showing the chart.">
|
||||
|
||||
@@ -19,20 +19,6 @@ limitations under the License.
|
||||
|
||||
<!-- Display settings -->
|
||||
<PreferenceScreen android:title="@string/settings_display">
|
||||
<CheckBoxPreference
|
||||
android:key="@string/metric_units_key"
|
||||
android:title="@string/settings_display_metric"
|
||||
android:summaryOn="@string/settings_display_metric_summary_on"
|
||||
android:summaryOff="@string/settings_display_metric_summary_off"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="@string/report_speed_key"
|
||||
android:title="@string/settings_display_speed"
|
||||
android:summaryOn="@string/settings_display_speed_summary_on"
|
||||
android:summaryOff="@string/settings_display_speed_summary_off"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<ListPreference android:key="@string/track_color_mode_key"
|
||||
android:title="@string/settings_display_track_color"
|
||||
android:summary="@string/settings_display_track_color_summary"
|
||||
@@ -85,7 +71,10 @@ limitations under the License.
|
||||
</EditTextPreference>
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
|
||||
<Preference
|
||||
android:key="@string/settings_stats_key"
|
||||
android:persistent="false"
|
||||
android:title="@string/track_detail_stats_tab" />
|
||||
<Preference
|
||||
android:title="@string/settings_recording"
|
||||
android:key="@string/settings_recording_key"
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
<?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_stats_tab" >
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/metric_units_key"
|
||||
android:summaryOff="@string/settings_stats_units_imperial"
|
||||
android:summaryOn="@string/settings_stats_units_metric"
|
||||
android:title="@string/settings_stats_units_title" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/report_speed_key"
|
||||
android:title="@string/settings_stats_rate_title" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:key="@string/stats_use_total_time_key"
|
||||
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" >
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/stats_show_elevation_key"
|
||||
android:title="@string/stats_elevation" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/stats_show_grade_key"
|
||||
android:title="@string/settings_stats_grade" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/stats_show_coordinate_key"
|
||||
android:title="@string/settings_stats_coordinate" />
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user