[android] - fix public xml api for drawables, fixup QueryRenderedFeatursBoxSymbolCountActivity (#6879)

16 files changed, 20 insertions, 20 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
index 84a922ed1d..4524a59f0d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -94,16 +94,16 @@ public final class MapFragment extends Fragment {
         Drawable foregroundBearingDrawable = options.getMyLocationForegroundBearingDrawable();
         if (foregroundDrawable == null || foregroundBearingDrawable == null) {
             if (foregroundDrawable == null) {
-                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default);
+                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default);
             }
             if (foregroundBearingDrawable == null) {
-                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing);
+                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing);
             }
             options.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable);
         }
 
         if (options.getMyLocationBackgroundDrawable() == null) {
-            options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape));
+            options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape));
         }
 
         return map = new MapView(inflater.getContext(), options);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 30a48be150..51af4c029e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -218,17 +218,17 @@ public class MapboxMapOptions implements Parcelable {
 
             Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground);
             if (foregroundDrawable == null) {
-                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default);
+                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default);
             }
 
             Drawable foregroundBearingDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground_bearing);
             if (foregroundBearingDrawable == null) {
-                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing);
+                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing);
             }
 
             Drawable backgroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_background);
             if (backgroundDrawable == null) {
-                backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape);
+                backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape);
             }
 
             mapboxMapOptions.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index ff90f3f981..75d6a01191 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -103,16 +103,16 @@ public class SupportMapFragment extends Fragment {
         Drawable foregroundBearingDrawable = options.getMyLocationForegroundBearingDrawable();
         if (foregroundDrawable == null || foregroundBearingDrawable == null) {
             if (foregroundDrawable == null) {
-                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default);
+                foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default);
             }
             if (foregroundBearingDrawable == null) {
-                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing);
+                foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing);
             }
             options.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable);
         }
 
         if (options.getMyLocationBackgroundDrawable() == null) {
-            options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape));
+            options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape));
         }
 
         return map = new MapView(inflater.getContext(), options);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index 9d2eb95ef9..97f21a7b45 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -47,15 +47,15 @@
     <public name="mapbox_attribution_margin_bottom" type="attr" />
     <public name="mapbox_attribution_visibility" type="attr" />
 
-    <public name="mapbox_attribution_logo" type="drawable" />
-    <public name="mapbox_compass" type="drawable" />
-    <public name="mapbox_default_marker" type="drawable" />
-    <public name="mapbox_attribution_button_pressed_selector" type="drawable" />
-    <public name="mapbox_attribution_button_pressed_normal" type="drawable" />
-    <public name="mapbox_attribution_button_pressed_pressed" type="drawable" />
-    <public name="mapbox_my_location" type="drawable" />
-    <public name="mapbox_my_location_bearing" type="drawable" />
-    <public name="mapbox_my_location_stale" type="drawable" />
-    <public name="mapbox_my_location_ring" type="color" />
+    <public name="mapbox_logo_icon" type="drawable" />
+    <public name="mapbox_compass_icon" type="drawable" />
+    <public name="mapbox_marker_icon_default" type="drawable" />
+    <public name="mapbox_info_bg_selector" type="drawable" />
+    <public name="mapbox_info_icon_default" type="drawable" />
+    <public name="mapbox_info_icon_selected" type="drawable" />
+    <public name="mapbox_mylocation_icon_default" type="drawable" />
+    <public name="mapbox_mylocation_icon_bearing" type="drawable" />
+
+    <public name="mapbox_mylocation_ring" type="color" />
     <public name="mapbox_blue" type="color" />
 </resources>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png
index c93fa4781a..c93fa4781a 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_bearing.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png
index 120b7dd612..120b7dd612 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_default.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png
index 0d7d89a8b4..0d7d89a8b4 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_bearing.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png
index 831ef1acf4..831ef1acf4 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_default.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png
index 1056d617e9..1056d617e9 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_bearing.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png
index 37b1f7adbf..37b1f7adbf 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_default.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png
index 1ff2590606..1ff2590606 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_bearing.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png
index 520b85eff7..520b85eff7 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_default.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png
index 671c33a08e..671c33a08e 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_bearing.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png
index f9f4265d2a..f9f4265d2a 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_default.png
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocationview_bg_shape.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml
index df0687bbd3..df0687bbd3 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocationview_bg_shape.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
index 8e9b3a1ff6..78fedadda4 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java
@@ -70,7 +70,7 @@ public class QueryRenderedFeaturesBoxSymbolCountActivity extends AppCompatActivi
                     Log.e(TAG, "Could not load geojson: " + e.getMessage());
                     return;
                 }
-                mapboxMap.addImage("test-icon", BitmapFactory.decodeResource(getResources(), R.drawable.default_marker));
+                mapboxMap.addImage("test-icon", BitmapFactory.decodeResource(getResources(), R.drawable.mapbox_marker_icon_default));
                 mapboxMap.addLayer(new SymbolLayer("symbols-layer", "symbols-source").withProperties(iconImage("test-icon")));