diff --git a/MyTracks/res/values/colors.xml b/MyTracks/res/values/colors.xml
index 51f287256..1801e61b8 100644
--- a/MyTracks/res/values/colors.xml
+++ b/MyTracks/res/values/colors.xml
@@ -21,7 +21,6 @@ limitations under the License.
#FF444444
#FFffd700
#FFAAAAAA
- #FF00AA00
#FF00FFFF
#70000000
#FFFF0000
@@ -30,6 +29,10 @@ limitations under the License.
#FFFFFFFF
+
+ #FF00AA00
+ #8000AA00
+
#FF401465
#40401465
@@ -38,7 +41,7 @@ limitations under the License.
#FFF128F3
#40F128F3
-
+
#FFFF0000
#40FF0000
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java b/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
index 36bcdd4e0..31a196bee 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartValueSeries.java
@@ -85,29 +85,6 @@ public class ChartValueSeries {
this.title = context.getString(titleId);
}
- /**
- * Constructs a new chart value series.
- *
- * @param context The context for the chart
- * @param formatString The format of the decimal format for this series
- * @param fill The paint for filling the chart
- * @param stroke The paint for stroking the outside the chart, optional
- * @param rounding The factor to round the values by
- */
- public ChartValueSeries(Context context,
- String formatString,
- Paint fill,
- Paint stroke,
- int rounding,
- int titleId) {
- this.format = new DecimalFormat(formatString);
- this.fillPaint = fill;
- this.labelPaint = fill;
- this.strokePaint = stroke;
- this.rounding = rounding;
- this.title = context.getString(titleId);
- }
-
/**
* Draws the path of the chart
*/
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index 24888536a..f72a521fd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -197,8 +197,8 @@ public class ChartView extends View {
series[ELEVATION_SERIES] =
new ChartValueSeries(context,
"###,###",
- R.color.green,
- -1,
+ R.color.elevation_fill,
+ R.color.elevation_border,
100,
R.string.elevation);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
index afefd4910..775fd7971 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
@@ -26,18 +26,13 @@ import android.test.AndroidTestCase;
*/
public class ChartValueSeriesTest extends AndroidTestCase {
private ChartValueSeries series;
- private Paint fillPaint1;
@Override
protected void setUp() throws Exception {
- fillPaint1 = new Paint();
- fillPaint1.setStyle(Style.FILL);
- fillPaint1.setColor(getContext().getResources().getColor(R.color.green));
- fillPaint1.setAntiAlias(true);
series = new ChartValueSeries(getContext(),
"###,###",
- fillPaint1,
- null,
+ R.color.elevation_fill,
+ R.color.elevation_border,
100,
R.string.elevation);
}
@@ -48,7 +43,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
assertEquals(0, series.getMin());
assertEquals(0, series.getMax());
assertEquals(0.0, series.getSpread());
- assertEquals(fillPaint1, series.getPaint());
+ assertEquals(Style.STROKE, series.getPaint().getStyle());
assertEquals(getContext().getString(R.string.elevation),
series.getTitle());
assertTrue(series.isEnabled());