Merge heads

MyTracks/res/values/keys.xml

@@ -18,6 +18,8 @@ limitations under the License.
   <!-- Keys for persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="allow_access_key">allowAccess</string>
   <string name="announcement_frequency_key">announcementFrequency</string>
+  <string name="ant_bike_cadence_sensor_id_key">antBikeCadenceSensorId</string>
+  <string name="ant_combined_bike_sensor_id_key">antCombinedBikeSensorId</string>
   <string name="ant_heart_rate_monitor_id_key">antHeartRateMonitorId</string>
   <string name="ant_speed_distance_monitor_id_key">antSpeedDistanceMonitorId</string>
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
@@ -71,6 +73,8 @@ limitations under the License.
   <string name="settings_reset_key">settingsReset</string>
   <string name="settings_sensor_key">settingsSensor</string>
   <string name="settings_sensor_ant_key">settingsSensorAnt</string>
+  <string name="settings_sensor_ant_reset_bike_cadence_sensor_key">settingsSensorAntResetBikeCadenceSensor</string>
+  <string name="settings_sensor_ant_reset_combined_bike_sensor_key">settingsSensorAntResetCombinedBikeSensor</string>
   <string name="settings_sensor_ant_reset_heart_rate_monitor_key">settingsSensorAntResetHeartRateMonitor</string>
   <string name="settings_sensor_ant_reset_speed_distance_monitor_key">settingsSensorAntResetSpeedDistanceMonitor</string>
   <string name="settings_sensor_bluetooth_key">settingsSensorBluetooth</string>

MyTracks/res/values/strings.xml

@@ -368,7 +368,7 @@ limitations under the License.
       completion suggestion for wind surfing.">
     wind surfing
   </string>
- 
+
   <!-- Description -->
   <string name="description_activity_type"
     translation_description="Activity type description.
@@ -737,7 +737,7 @@ limitations under the License.
   </string>
   <string name="help_google_services_answer"
     translation_description="In the 'Help' page, the answer on locations of google services.
-    
+
      %1$s url. E.g., 'maps.google.com'.
      %2$s url. E.g., 'google.com/fusiontables'.
      %3$s url. E.g., 'docs.google.com'.">
@@ -1296,12 +1296,12 @@ limitations under the License.
   <string name="send_google_new_public_map"
     translation_description="When sending a track to Google Maps, the radio option to create a
       new public map as opposed to use an existing map.">
-    Create new public map 
+    Create new public map
   </string>
   <string name="send_google_new_unlisted_map"
     translation_description="When sending a track to Google Maps, the radio option to create a
       new unlisted map as opposed to use an existing map.">
-    Create new unlisted map 
+    Create new unlisted map
   </string>
   <string name="send_google_no_account_message"
     translation_description="When sending to Google, the dialog message when no Google account is
@@ -1730,6 +1730,20 @@ limitations under the License.
       %1$d: device id number. E.g., '1'.">
     Paired with: %1$d
   </string>
+  <string name="settings_sensor_ant_reset_bike_candence_sensor"
+    translation_description="In the 'Sensor' settings, under the 'ANT+ options', the option to reset
+      an ANT+ bike cadence sensor. Note that ANT+ is a radio standard.
+
+      Character limit: ~26 (1 line)">
+    Reset bike cadence
+  </string>
+  <string name="settings_sensor_ant_reset_combined_bike_sensor"
+    translation_description="In the 'Sensor' settings, under the 'ANT+ options', the option to reset
+      an ANT+ combined bike cadence and speed sensor. Note that ANT+ is a radio standard.
+
+      Character limit: ~26 (1 line)">
+    Reset combined bike
+  </string>
   <string name="settings_sensor_ant_reset_heart_rate_monitor"
     translation_description="In the 'Sensor' settings, under the 'ANT+ options', the option to reset
       an ANT+ heart rate monitor. Note that ANT+ is a radio standard.

MyTracks/res/values/styles.xml

@@ -40,6 +40,7 @@ limitations under the License.
   </style>
   <!-- The style for choose upload service image view -->
   <style name="ChooseUploadServiceImageView">
+    <item name="android:layout_gravity">center</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>

MyTracks/res/xml/sensor_settings.xml

@@ -47,5 +47,13 @@ limitations under the License.
       android:key="@string/settings_sensor_ant_reset_speed_distance_monitor_key"
       android:persistent="false"
       android:title="@string/settings_sensor_ant_reset_speed_distance_monitor" />
+    <Preference
+      android:key="@string/settings_sensor_ant_reset_bike_cadence_sensor_key"
+      android:persistent="false"
+      android:title="@string/settings_sensor_ant_reset_bike_candence_sensor" />
+    <Preference
+      android:key="@string/settings_sensor_ant_reset_combined_bike_sensor_key"
+      android:persistent="false"
+      android:title="@string/settings_sensor_ant_reset_combined_bike_sensor" />
   </PreferenceCategory>
 </PreferenceScreen>