Merge heads

2012-06-04 13:20:38 +08:00
parent cad1a105ca
commit 953bd8b908
22 changed files with 325 additions and 306 deletions
@@ -160,8 +160,8 @@ public class ChartView extends View {
        new int[] {25, 50 },
        R.string.description_sensor_heart_rate,
        R.string.description_sensor_heart_rate,
-        R.color.heartrate_fill,
-        R.color.heartrate_border);
+        R.color.heart_rate_fill,
+        R.color.heart_rate_border);
    series[CADENCE_SERIES] = new ChartValueSeries(context,
        0,
        Integer.MAX_VALUE,