merge heads

This commit is contained in:
Jimmy Shih
2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
+8 -8
View File
@@ -37,7 +37,7 @@ limitations under the License.
<TableRow>
<TextView
android:layout_span="5"
android:text="@string/sensor_state" />
android:text="@string/menu_sensor_state" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -52,7 +52,7 @@ limitations under the License.
<TableRow>
<TextView
android:layout_span="5"
android:text="@string/sensor_data_time" />
android:text="@string/sensor_state_last_sensor_time" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -69,7 +69,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/power" />
android:text="@string/sensor_state_power" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -90,7 +90,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/cadence" />
android:text="@string/sensor_state_cadence" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -110,7 +110,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/heart_rate" />
android:text="@string/sensor_state_heart_rate" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -122,7 +122,7 @@ limitations under the License.
<TextView
style="@style/StatsUnitSolo"
android:layout_column="5"
android:text="@string/bpm" />
android:text="@string/unit_beat_per_minute" />
</TableRow>
<!-- Battery Level -->
@@ -131,7 +131,7 @@ limitations under the License.
<TextView
android:layout_column="1"
android:layout_span="3"
android:text="@string/battery_level" />
android:text="@string/sensor_state_battery" />
</TableRow>
<TableRow
android:background="@color/stat_label_background">
@@ -143,7 +143,7 @@ limitations under the License.
<TextView
style="@style/StatsUnitSolo"
android:layout_column="5"
android:text="@string/percent" />
android:text="@string/unit_percent" />
</TableRow>
</TableLayout>