From ffce767615841ef523c0df47221afaca12976036 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Mon, 27 Jan 2014 15:08:05 +0100
Subject: [PATCH] remove old Android.makeMarker()

---
 vtm-android-app                                             | 2 +-
 .../src/org/oscim/android/test/MarkerOverlayActivity.java   | 6 +++---
 .../src/org/oscim/android/canvas/AndroidGraphics.java       | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/vtm-android-app b/vtm-android-app
index 88d1b3ea..3b8538de 160000
--- a/vtm-android-app
+++ b/vtm-android-app
@@ -1 +1 @@
-Subproject commit 88d1b3ea76cab934393c6953313b715bdc68ecf4
+Subproject commit 3b8538de3c77017f26466bbbf8460b468e59ff21
diff --git a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
index ef67152b..bb0f9d98 100644
--- a/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java
@@ -30,6 +30,7 @@ import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerItem.HotspotPlace;
 import org.oscim.layers.marker.MarkerSymbol;
 
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.widget.Toast;
 
@@ -44,9 +45,8 @@ public class MarkerOverlayActivity extends MapActivity implements OnItemGestureL
 		mMapView = (MapView) findViewById(R.id.mapView);
 		registerMapView(mMapView);
 
-		MarkerSymbol symbol = AndroidGraphics.makeMarker(getResources(),
-		                                                 R.drawable.marker_poi,
-		                                                 HotspotPlace.CENTER);
+		Drawable d = getResources().getDrawable(R.drawable.marker_poi);
+		MarkerSymbol symbol = AndroidGraphics.makeMarker(d, HotspotPlace.CENTER);
 
 		ItemizedIconLayer<MarkerItem> markerLayer =
 		        new ItemizedIconLayer<MarkerItem>(mMap, new ArrayList<MarkerItem>(),
diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
index f4053a41..5ec82f80 100644
--- a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -26,7 +26,6 @@ import org.oscim.backend.canvas.Paint;
 import org.oscim.layers.marker.MarkerItem.HotspotPlace;
 import org.oscim.layers.marker.MarkerSymbol;
 
-import android.content.res.Resources;
 import android.graphics.Bitmap.Config;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -90,10 +89,6 @@ public final class AndroidGraphics extends CanvasAdapter {
 		return new AndroidBitmap(bitmap);
 	}
 
-	public static MarkerSymbol makeMarker(Resources res, int id, HotspotPlace place) {
-		return makeMarker(res.getDrawable(id), place);
-	}
-
 	public static MarkerSymbol makeMarker(Drawable drawable, HotspotPlace place) {
 		if (place == null)
 			place = HotspotPlace.CENTER;