karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 3 Activity

Merge heads

Browse Source
This commit is contained in:
youtaol
2013-08-22 10:14:45 +08:00
parent 83b1fb67bf
commit b6b54923b2
37 changed files with 434 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/xml/backup_reset_settings.xml
+1 -1
View File
@@ -19,7 +19,7 @@ limitations under the License.
<Preference
android:key="@string/settings_backup_key"
android:persistent="false"
android:title="@string/settings_backup_now" />
android:title="@string/settings_backup" />
<Preference
android:key="@string/settings_restore_key"
android:persistent="false"
MyTracks/res/xml/chart_settings.xml
+3 -5
View File
@@ -16,11 +16,9 @@ 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"
<ListPreference
android:defaultValue="@string/chart_x_axis_distance"
android:key="@string/chart_x_axis_key"
android:title="@string/settings_chart_x_axis" />
<PreferenceCategory android:title="@string/settings_show" >
<CheckBoxPreference
MyTracks/res/xml/stats_settings.xml
+3 -3
View File
@@ -20,9 +20,9 @@ limitations under the License.
android:defaultValue="@string/stats_units_metric"
android:key="@string/stats_units_key"
android:title="@string/settings_stats_units_title" />
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/report_speed_key"
<ListPreference
android:defaultValue="@string/stats_rate_speed"
android:key="@string/stats_rate_key"
android:title="@string/settings_stats_rate_title" />
<PreferenceCategory android:title="@string/settings_show" >
<CheckBoxPreference