diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-11-02 12:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 12:41:22 +0100 |
commit | 4d0c42e36ae384102b624476e3d04c94a02190c7 (patch) | |
tree | e786a18445ee47f479e73eb47fa2d87631fa4e10 /platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml | |
parent | 9ad5dd15857e7d15810877e2173839f45cc5e343 (diff) | |
download | qtlocation-mapboxgl-4d0c42e36ae384102b624476e3d04c94a02190c7.tar.gz |
Prefix library resources to avoid naming conflicts (#6878)
* [android] - add library resource prefix
* update SDK resources with prefix
* fixup tests
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index c5bb8d71b3..e1931585bc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -80,10 +80,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:center_latitude="37.176546" - app:center_longitude="-3.599007" - app:style_url="@string/style_emerald" - app:zoom="15" /> + app:mapbox_center_latitude="37.176546" + app:mapbox_center_longitude="-3.599007" + app:mapbox_style_url="@string/mapbox_style_emerald" + app:mapbox_zoom="15" /> <android.support.design.widget.FloatingActionButton android:id="@+id/fab" |