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

Place sensor settings in SensorSettingsActivity.

Browse Source
This commit is contained in:
Jimmy Shih
2012-05-04 17:48:33 -07:00
parent 3008b335a7
commit 77903ed2c9
16 changed files with 287 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/xml/preferences.xml
+4 -39
View File
@@ -86,53 +86,18 @@ limitations under the License.
</PreferenceCategory>
</PreferenceScreen>
<!-- Recording -->
<Preference
android:title="@string/settings_recording"
android:key="@string/settings_recording_key"
android:persistent="false" />
<!-- Sharing -->
<Preference
android:title="@string/settings_sharing"
android:key="@string/settings_sharing_key"
android:persistent="false" />
<!-- Sensors -->
<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"
android:summary="@string/settings_sensor_type_summary"
android:entries="@array/sensor_type_options"
android:entryValues="@array/sensor_type_values"
android:defaultValue="@string/sensor_type_value_none"/>
<!-- Bluetooth -->
<PreferenceCategory android:title="@string/settings_sensor_bluetooth_options">
<ListPreference android:key="@string/bluetooth_sensor_key"
android:title="@string/settings_sensor_bluetooth_sensor"
android:summary="@string/settings_sensor_bluetooth_sensor_summary"
android:defaultValue="" />
<Preference android:key="@string/bluetooth_pairing_key"
android:title="@string/settings_sensor_bluetooth_pairing"
android:summary="@string/settings_sensor_bluetooth_pairing_summary"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_sensor_ant_options"
android:key="@string/ant_options_key">
<com.google.android.apps.mytracks.AntPreference
android:key="@string/ant_heart_rate_sensor_id_key"
android:title="@string/settings_sensor_unpair_ant"/>
<com.google.android.apps.mytracks.AntPreference
android:key="@string/ant_srm_bridge_sensor_id_key"
android:title="@string/settings_sensor_unpair_srm"/>
</PreferenceCategory>
</PreferenceScreen>
<!-- Backup -->
<Preference
android:title="@string/settings_sensor"
android:key="@string/settings_sensor_key"
android:persistent="false" />
<Preference
android:title="@string/settings_backup"
android:key="@string/settings_backup_key"