merge heads

2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
@@ -33,7 +33,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
        R.color.elevation_fill,
        R.color.elevation_border,
        new ZoomSettings(5, new int[] {100}),
-        R.string.stat_elevation);
+        R.string.stats_elevation);
  }

  public void testInitialConditions() {
@@ -43,7 +43,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
    assertEquals(0, series.getMax());
    assertEquals(0.0, series.getSpread());
    assertEquals(Style.STROKE, series.getPaint().getStyle());
-    assertEquals(getContext().getString(R.string.stat_elevation),
+    assertEquals(getContext().getString(R.string.stats_elevation),
        series.getTitle());
    assertTrue(series.isEnabled());
  }