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

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-07 09:27:10 -08:00
parent 96d8397787 014e5257d0
commit 32bc71ae0f
30 changed files with 1246 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/xml/preferences.xml
+3 -3
View File
@@ -40,7 +40,7 @@ limitations under the License.
android:entryValues="@array/track_color_mode_values"
android:defaultValue="@string/track_color_mode_value_none"/>
<PreferenceCategory android:title="@string/fixed_speed_options"
<PreferenceCategory android:title="@string/track_color_mode_option_fixed"
android:key="@string/track_color_mode_fixed_speed_options_key">
<EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key"
android:title="@string/settings_track_color_mode_fixed_speed_slow"
@@ -75,7 +75,7 @@ limitations under the License.
</EditTextPreference>
</PreferenceCategory>
<PreferenceCategory android:title="@string/dynamic_speed_options">
<PreferenceCategory android:title="@string/track_color_mode_option_dynamic">
<EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key"
android:title="@string/settings_track_color_mode_dynamic_speed_variation"
android:summary="@string/settings_track_color_mode_dynamic_speed_variation_summary"
@@ -154,7 +154,7 @@ limitations under the License.
</PreferenceScreen>
<!-- Sensors -->
<PreferenceScreen android:title="@string/sensor_options"
<PreferenceScreen android:title="@string/settings_sensor"
android:key="@string/sensor_options_key">
<ListPreference android:key="@string/sensor_type_key"
android:title="@string/settings_sensor_type"