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/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.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/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml new file mode 100644 index 0000000000..c6dcd35a2f --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + + <SurfaceView + android:id="@+id/surfaceView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <FrameLayout + android:id="@+id/markerViewContainer" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/transparent" /> + + <com.mapbox.mapboxsdk.maps.widgets.MyLocationView + android:id="@+id/userLocationView" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <com.mapbox.mapboxsdk.maps.widgets.CompassView + android:id="@+id/compassView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ImageView + android:id="@+id/logoView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/mapbox_iconContentDescription" + android:src="@drawable/mapbox_logo_icon" /> + + <ImageView + android:id="@+id/attributionView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:background="@drawable/mapbox_default_bg_selector" + android:clickable="true" + android:contentDescription="@string/mapbox_attributionsIconContentDescription" + android:padding="7dp" + android:src="@drawable/mapbox_info_bg_selector" /> + +</merge>
\ No newline at end of file |