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:
youtaol
2012-05-30 09:49:31 +08:00
parent d98617b23c
commit ad01b379c7
30 changed files with 1444 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/sensor_state.xml
+6 -6
View File
@@ -34,12 +34,12 @@ limitations under the License.
<TextView
android:id="@+id/sensor_state_last_sensor_time"
style="@style/SensorStateValue" />
<!-- Power -->
<!-- Heart rate -->
<TextView
android:text="@string/sensor_state_power"
android:text="@string/sensor_state_heart_rate"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_power"
android:id="@+id/sensor_state_heart_rate"
style="@style/SensorStateValue" />
<!-- Cadence -->
<TextView
@@ -48,12 +48,12 @@ limitations under the License.
<TextView
android:id="@+id/sensor_state_cadence"
style="@style/SensorStateValue" />
<!-- Heart rate -->
<!-- Power -->
<TextView
android:text="@string/sensor_state_heart_rate"
android:text="@string/sensor_state_power"
style="@style/TextMedium" />
<TextView
android:id="@+id/sensor_state_heart_rate"
android:id="@+id/sensor_state_power"
style="@style/SensorStateValue" />
<!-- Battery level -->
<TextView