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

Merging gingerbread changes to head.

Browse Source
This commit is contained in:
Rodrigo Damazio
2010-12-10 14:30:29 -02:00
parent 93b95954c4
commit 19d5fe1ba6
111 changed files with 5041 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/xml/preferences.xml
+23 -8
View File
@@ -84,14 +84,6 @@ limitations under the License.
android:entryValues="@array/min_required_accuracy_values"
android:defaultValue="200" />
<com.google.android.apps.mytracks.IntegerListPreference
android:key="@string/signal_sampling_frequency_key"
android:title="@string/settings_signal_sampling_frequency"
android:summary="@string/settings_signal_sampling_frequency_summary"
android:entries="@array/task_frequency_options"
android:entryValues="@array/task_frequency_values"
android:defaultValue="-1" />
<com.google.android.apps.mytracks.IntegerListPreference
android:key="@string/auto_resume_track_timeout_key"
android:title="@string/settings_auto_resume_track_timeout"
@@ -109,6 +101,29 @@ limitations under the License.
</PreferenceScreen>
<!-- Sensors -->
<PreferenceScreen android:title="@string/sensor_options">
<ListPreference android:key="@string/sensor_type_key"
android:title="@string/settings_sensor_type"
android:summary="@string/settings_sensor_type_summary"
android:entries="@array/sensor_type_options"
android:entryValues="@array/sensor_type_values"
android:defaultValue="@string/none"/>
<!-- Bluetooth -->
<PreferenceCategory android:title="@string/bluetooth_options">
<ListPreference android:key="@string/bluetooth_sensor_key"
android:title="@string/bluetooth_sensor_title"
android:summary="@string/bluetooth_sensor_summary"
android:defaultValue="any" />
<Preference android:key="@string/bluetooth_pairing_key"
android:title="@string/bluetooth_pairing"
android:summary="@string/bluetooth_pairing_summary"
android:persistent="false" />
</PreferenceCategory>
</PreferenceScreen>
<!-- Sharing settings -->
<PreferenceScreen android:title="@string/settings_sharing">
<CheckBoxPreference