Prefix library resources to avoid naming conflicts (#6878)

* [android] - add library resource prefix

* update SDK resources with prefix

* fixup tests

6 files changed, 9 insertions, 9 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
index 56c1b643a1..2e502545d0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java
@@ -120,14 +120,14 @@ public final class IconFactory {
 
     public Icon defaultMarker() {
         if (mDefaultMarker == null) {
-            mDefaultMarker = fromResource(R.drawable.default_marker);
+            mDefaultMarker = fromResource(R.drawable.mapbox_marker_icon_default);
         }
         return mDefaultMarker;
     }
 
     public Icon defaultMarkerView() {
         if (mDefaultMarkerView == null) {
-            mDefaultMarkerView = fromResource(R.drawable.default_markerview);
+            mDefaultMarkerView = fromResource(R.drawable.mapbox_markerview_icon_default);
         }
         return mDefaultMarkerView;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index 9af459e8a0..2459f6e79a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
@@ -129,8 +129,8 @@ public class InfoWindow {
                 final float mapRight = mapView.getRight();
                 final float mapLeft = mapView.getLeft();
 
-                float marginHorizontal = resources.getDimension(R.dimen.infowindow_margin);
-                float tipViewOffset = resources.getDimension(R.dimen.infowindow_tipview_width) / 2;
+                float marginHorizontal = resources.getDimension(R.dimen.mapbox_infowindow_margin);
+                float tipViewOffset = resources.getDimension(R.dimen.mapbox_infowindow_tipview_width) / 2;
                 float tipViewMarginLeft = view.getMeasuredWidth() / 2 - tipViewOffset;
 
                 boolean outOfBoundsLeft = false;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
index d2afafc59d..41c7fc9e97 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java
@@ -20,7 +20,7 @@ final class InfoWindowTipView extends View {
         super(context, attrs);
 
         mPath = new Path();
-        mLineWidth = (int) context.getResources().getDimension(R.dimen.infowindow_line_width);
+        mLineWidth = (int) context.getResources().getDimension(R.dimen.mapbox_infowindow_line_width);
         mPaint = new Paint();
         mPaint.setColor(Color.WHITE);
         mPaint.setAntiAlias(true);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
index 80dc5931a7..7595073aa2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java
@@ -25,7 +25,7 @@ class InfoWindowView extends RelativeLayout {
     }
 
     private void initialize(Context context) {
-        LayoutInflater.from(context).inflate(R.layout.infowindow_content, this);
+        LayoutInflater.from(context).inflate(R.layout.mapbox_infowindow_content, this);
         mTipView = (InfoWindowTipView) findViewById(R.id.infowindow_tipview);
     }
 
@@ -33,6 +33,6 @@ class InfoWindowView extends RelativeLayout {
         RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) mTipView.getLayoutParams();
         layoutParams.leftMargin = marginLeft;
         // This is a bit of a hack but prevents an occasional gap between the InfoWindow
-        layoutParams.topMargin = (int) getResources().getDimension(R.dimen.infowindow_offset);
+        layoutParams.topMargin = (int) getResources().getDimension(R.dimen.mapbox_infowindow_offset);
     }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
index e1f692a6f4..ae0f9200ab 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java
@@ -185,7 +185,7 @@ public class Marker extends Annotation {
 
     private InfoWindow getInfoWindow(@NonNull MapView mapView) {
         if (infoWindow == null && mapView.getContext() != null) {
-            infoWindow = new InfoWindow(mapView, R.layout.infowindow_view, getMapboxMap());
+            infoWindow = new InfoWindow(mapView, R.layout.mapbox_infowindow_view, getMapboxMap());
         }
         return infoWindow;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index cd333268a1..e17165ae49 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -538,7 +538,7 @@ public class MarkerViewManager {
             ViewHolder viewHolder;
             if (convertView == null) {
                 viewHolder = new ViewHolder();
-                convertView = inflater.inflate(R.layout.view_image_marker, parent, false);
+                convertView = inflater.inflate(R.layout.mapbox_view_image_marker, parent, false);
                 viewHolder.imageView = (ImageView) convertView.findViewById(R.id.image);
                 convertView.setTag(viewHolder);
             } else {