Commit 4e030992 authored by Evan W. Patton's avatar Evan W. Patton Committed by Susan Rati Lane

Associate marker asset with Map for runtime markers (#1868)

Change-Id: I9338893e68d64d67207c107b039dc4d7cfbfb556
parent 7c4557f9
...@@ -74,7 +74,7 @@ import java.util.List; ...@@ -74,7 +74,7 @@ import java.util.List;
"different location, for example to add Markers off-screen, then the "Reset Map to " + "different location, for example to add Markers off-screen, then the "Reset Map to " +
"Initial Bounds&quot; button can be used to re-center the Map at the starting location.</p>") "Initial Bounds&quot; button can be used to re-center the Map at the starting location.</p>")
@SimpleObject @SimpleObject
@UsesAssets(fileNames = "location.png") @UsesAssets(fileNames = "location.png, marker.svg")
@UsesPermissions(permissionNames = "android.permission.INTERNET, " + "android.permission.ACCESS_FINE_LOCATION, " @UsesPermissions(permissionNames = "android.permission.INTERNET, " + "android.permission.ACCESS_FINE_LOCATION, "
+ "android.permission.ACCESS_COARSE_LOCATION, " + "android.permission.ACCESS_WIFI_STATE, " + "android.permission.ACCESS_COARSE_LOCATION, " + "android.permission.ACCESS_WIFI_STATE, "
+ "android.permission.ACCESS_NETWORK_STATE, " + "android.permission.WRITE_EXTERNAL_STORAGE, " + "android.permission.ACCESS_NETWORK_STATE, " + "android.permission.WRITE_EXTERNAL_STORAGE, "
......
...@@ -40,7 +40,6 @@ import android.util.Log; ...@@ -40,7 +40,6 @@ import android.util.Log;
"can be used to provide an info window, custom fill and stroke colors, and custom " + "can be used to provide an info window, custom fill and stroke colors, and custom " +
"images to convey information to the user.</p>") "images to convey information to the user.</p>")
@SimpleObject @SimpleObject
@UsesAssets(fileNames = "marker.svg")
@UsesLibraries(libraries = "osmdroid.aar, androidsvg.jar") @UsesLibraries(libraries = "osmdroid.aar, androidsvg.jar")
public class Marker extends MapFeatureBaseWithFill implements MapMarker { public class Marker extends MapFeatureBaseWithFill implements MapMarker {
private static final String TAG = Marker.class.getSimpleName(); private static final String TAG = Marker.class.getSimpleName();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment