Merge heads

This commit is contained in:
youtaol
2012-06-01 14:35:03 +08:00
parent ad01b379c7
commit cad1a105ca
45 changed files with 744 additions and 4247 deletions
+8 -8
View File
@@ -39,13 +39,13 @@ limitations under the License.
<PreferenceCategory
android:key="@string/settings_sensor_ant_key"
android:title="@string/settings_sensor_ant_options" >
<com.google.android.apps.mytracks.AntPreference
android:defaultValue="0"
android:key="@string/ant_heart_rate_sensor_id_key"
android:title="@string/settings_sensor_unpair_ant" />
<com.google.android.apps.mytracks.AntPreference
android:defaultValue="0"
android:key="@string/ant_srm_bridge_sensor_id_key"
android:title="@string/settings_sensor_unpair_srm" />
<Preference
android:key="@string/settings_sensor_ant_reset_heart_rate_monitor_key"
android:persistent="false"
android:title="@string/settings_sensor_ant_reset_heart_rate_monitor" />
<Preference
android:key="@string/settings_sensor_ant_reset_speed_distance_monitor_key"
android:persistent="false"
android:title="@string/settings_sensor_ant_reset_speed_distance_monitor" />
</PreferenceCategory>
</PreferenceScreen>