merge heads

2026-10-04 18:43:07 +02:00 · 2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 deletions
@@ -210,7 +210,7 @@ public class ChartView extends View {
                             R.color.elevation_border,
                             new ZoomSettings(MAX_INTERVALS,
                                 new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}),
-                             R.string.elevation);
+                             R.string.elevation_label);

    series[SPEED_SERIES] =
        new ChartValueSeries(context,