Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
appinventor-sources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
appinventor-sources
Commits
4e030992
Commit
4e030992
authored
Oct 01, 2019
by
Evan W. Patton
Committed by
Susan Rati Lane
Oct 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Associate marker asset with Map for runtime markers (#1868)
Change-Id: I9338893e68d64d67207c107b039dc4d7cfbfb556
parent
7c4557f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
appinventor/components/src/com/google/appinventor/components/runtime/Map.java
...ts/src/com/google/appinventor/components/runtime/Map.java
+1
-1
appinventor/components/src/com/google/appinventor/components/runtime/Marker.java
...src/com/google/appinventor/components/runtime/Marker.java
+0
-1
No files found.
appinventor/components/src/com/google/appinventor/components/runtime/Map.java
View file @
4e030992
...
@@ -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" button can be used to re-center the Map at the starting location.</p>"
)
"Initial Bounds" 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, "
...
...
appinventor/components/src/com/google/appinventor/components/runtime/Marker.java
View file @
4e030992
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment