summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2015-11-25 13:13:04 +0000
committerTobrun <tobrun.van.nuland@gmail.com>2015-11-25 21:25:32 +0100
commit0f976ef7d28bb9536866521b3d9096de558b5b58 (patch)
treeaa880fcbcd004809bded92223e98534107f4d348 /android
parent99dd6140fd9e1fddb64d710d6177f0278cb7d309 (diff)
downloadqtlocation-mapboxgl-0f976ef7d28bb9536866521b3d9096de558b5b58.tar.gz
[android] #3008 - upgrade android grade plugin to 1.5.0
[android] #2386 - Add vector drawable and rippleDrawable for attribution icon [android] #2736 - Replace bitmap assets with vector drawable
Diffstat (limited to 'android')
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.pngbin2194 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.pngbin2133 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.pngbin1354 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.pngbin1391 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml9
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.pngbin2710 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.pngbin2738 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.pngbin4256 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.pngbin4240 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.pngbin730 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.pngbin836 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml5
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml6
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml9
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml5
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml3
-rw-r--r--android/MapboxGLAndroidSDK/src/main/res/values/colors.xml1
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java3
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java2
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_add_black_24dp.pngbin124 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.pngbin280 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.pngbin267 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.pngbin188 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_delete_white_24dp.pngbin161 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_center_focus_white_24dp.pngbin251 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.pngbin199 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.pngbin224 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.pngbin215 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_gps_fixed_white_24dp.pngbin546 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.pngbin172 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.pngbin116 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.pngbin549 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_navigation_white_24dp.pngbin341 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.pngbin330 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_place_white_24dp.pngbin371 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.pngbin227 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.pngbin164 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_add_black_24dp.pngbin86 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.pngbin176 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.pngbin207 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.pngbin119 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_delete_white_24dp.pngbin115 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_center_focus_white_24dp.pngbin174 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.pngbin132 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.pngbin136 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.pngbin135 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_gps_fixed_white_24dp.pngbin350 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.pngbin147 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.pngbin99 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.pngbin341 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_navigation_white_24dp.pngbin250 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.pngbin233 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_place_white_24dp.pngbin265 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.pngbin179 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.pngbin175 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_add_black_24dp.pngbin108 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.pngbin260 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.pngbin303 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.pngbin155 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_delete_white_24dp.pngbin151 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_center_focus_white_24dp.pngbin270 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.pngbin191 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.pngbin201 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.pngbin190 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_gps_fixed_white_24dp.pngbin687 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.pngbin190 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.pngbin135 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.pngbin660 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_navigation_white_24dp.pngbin434 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.pngbin417 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_place_white_24dp.pngbin456 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.pngbin243 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.pngbin249 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_add_black_24dp.pngbin114 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.pngbin365 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.pngbin445 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.pngbin198 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.pngbin194 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_center_focus_white_24dp.pngbin384 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.pngbin256 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.pngbin279 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.pngbin263 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_gps_fixed_white_24dp.pngbin1012 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.pngbin230 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.pngbin183 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.pngbin976 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_navigation_white_24dp.pngbin607 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.pngbin584 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_place_white_24dp.pngbin675 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.pngbin367 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.pngbin300 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.pngbin119 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.pngbin450 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.pngbin566 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.pngbin252 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.pngbin243 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_center_focus_white_24dp.pngbin497 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.pngbin329 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.pngbin343 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.pngbin332 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_gps_fixed_white_24dp.pngbin1379 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.pngbin255 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.pngbin235 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.pngbin1334 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_navigation_white_24dp.pngbin798 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.pngbin769 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_place_white_24dp.pngbin869 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.pngbin408 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.pngbin415 -> 0 bytes
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml9
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml69
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml2
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml28
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml2
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml1
-rw-r--r--android/build.gradle2
133 files changed, 247 insertions, 62 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png
deleted file mode 100644
index de44e3ddc0..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png
deleted file mode 100644
index fa26786242..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png
deleted file mode 100644
index dd50478ac1..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png
deleted file mode 100644
index d377f3cb8c..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml
new file mode 100644
index 0000000000..ef82c18f5d
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@android:color/white" />
+ </shape>
+ </item>
+</ripple> \ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png
deleted file mode 100644
index df7d7a8875..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png
deleted file mode 100644
index f5b1833641..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png
deleted file mode 100644
index 0a04d4eaad..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png
deleted file mode 100644
index faaef0625d..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png
deleted file mode 100644
index bcee96deaa..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png
deleted file mode 100644
index 781263f760..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml
deleted file mode 100644
index b5fedb0fd0..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/attribution_button_pressed" android:state_pressed="true" />
- <item android:drawable="@drawable/attribution_button_normal" />
-</selector> \ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml
new file mode 100644
index 0000000000..48e53e7ee8
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@color/gray_light" android:state_pressed="true" />
+ <item android:drawable="@color/gray_light" android:state_focused="true" />
+ <item android:drawable="@android:color/transparent" />
+</selector> \ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml
new file mode 100644
index 0000000000..fa82bb8d9b
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF1E8CAB"
+ android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/>
+</vector>
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml
new file mode 100644
index 0000000000..074928d05a
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#551E8CAB"
+ android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml
new file mode 100644
index 0000000000..7f6245b30a
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/ic_info_outline_24dp_selected" android:state_pressed="true" />
+ <item android:drawable="@drawable/ic_info_outline_24dp" />
+</selector> \ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
index 92cd2315f4..a7503332a4 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
@@ -26,7 +26,8 @@
android:clickable="true"
android:contentDescription="@string/attributionsIconContentDescription"
android:padding="7dp"
- android:src="@drawable/attribution_button_selector" />
+ android:src="@drawable/ic_info_outline_24dp_selector"
+ android:background="@drawable/bg_default_selector"/>
<com.mapbox.mapboxsdk.views.UserLocationView
android:id="@+id/userLocationView"
diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
index b87580661d..97d29c7d45 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="gray">#7D7F80</color>
+ <color name="gray_light">#EEEEEE</color>
<color name="mapbox_blue">#1E8CAB</color>
<color name="my_location_ring">@color/mapbox_blue</color>
</resources>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
index 0a489edaa1..e78d3f2736 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java
@@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
import com.mapbox.mapboxsdk.annotations.Sprite;
import com.mapbox.mapboxsdk.annotations.SpriteFactory;
-import com.mapbox.mapboxsdk.constants.Style;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.utils.ApiAccess;
import com.mapbox.mapboxsdk.views.MapView;
@@ -47,7 +46,7 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
mMapView.onCreate(savedInstanceState);
mSpriteFactory = new SpriteFactory(mMapView);
- mIconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_black_48dp);
+ mIconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_24dp);
mMapView.setInfoWindowAdapter(new MapView.InfoWindowAdapter() {
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index 6c44a9344d..9995a15840 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
@@ -101,7 +101,7 @@ public class MainActivity extends AppCompatActivity {
final ActionBar ab = getSupportActionBar();
if (ab != null) {
- ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+ ab.setHomeAsUpIndicator(R.drawable.ic_menu_24dp);
ab.setDisplayHomeAsUpEnabled(true);
}
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_add_black_24dp.png
deleted file mode 100644
index c04b523c48..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_add_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png
deleted file mode 100644
index 3b450909f7..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_blur_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 0c963e1ca0..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_bug_report_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png
deleted file mode 100644
index 9bfca35815..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_crop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f769475..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_center_focus_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_center_focus_white_24dp.png
deleted file mode 100644
index 38a4037e03..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_center_focus_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png
deleted file mode 100644
index 3d01316bb4..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_filter_none_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png
deleted file mode 100644
index 59a66c164d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_back_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png
deleted file mode 100644
index 5ee83ad6bb..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_flip_to_front_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_gps_fixed_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_gps_fixed_white_24dp.png
deleted file mode 100644
index 745db489be..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_gps_fixed_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png
deleted file mode 100644
index c542d2aa76..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_location_city_black_48dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png
deleted file mode 100644
index 8962cbd91f..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_menu.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png
deleted file mode 100644
index 85e38726dd..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_my_location_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_navigation_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_navigation_white_24dp.png
deleted file mode 100644
index 1873e58b6e..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_navigation_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
deleted file mode 100644
index d545f6f157..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_pin_drop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_place_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_place_white_24dp.png
deleted file mode 100644
index 7c281c3f52..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_place_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index a9864a8fcf..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_trending_up_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png
deleted file mode 100644
index 81c6a155b3..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/ic_widgets_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_add_black_24dp.png
deleted file mode 100644
index 23bf119211..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_add_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png
deleted file mode 100644
index 07a55769b8..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_blur_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 86e15f0d71..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_bug_report_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png
deleted file mode 100644
index 8e78d8e9e4..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_crop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f35558..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_center_focus_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_center_focus_white_24dp.png
deleted file mode 100644
index b3fdd44cc3..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_center_focus_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png
deleted file mode 100644
index 037f444f4c..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_filter_none_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png
deleted file mode 100644
index ddae8520f8..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_back_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png
deleted file mode 100644
index 9a178ebd28..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_flip_to_front_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_gps_fixed_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_gps_fixed_white_24dp.png
deleted file mode 100644
index d1c563cc9f..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_gps_fixed_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png
deleted file mode 100644
index 06853dd255..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_location_city_black_48dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png
deleted file mode 100644
index c62db8c865..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_menu.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png
deleted file mode 100644
index 5684aa7dc5..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_my_location_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_navigation_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_navigation_white_24dp.png
deleted file mode 100644
index c445d26207..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_navigation_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
deleted file mode 100644
index 523fd09996..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_pin_drop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_place_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_place_white_24dp.png
deleted file mode 100644
index 933eb5148f..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_place_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index fb04031d47..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_trending_up_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png
deleted file mode 100644
index 9b8c1c57ba..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/ic_widgets_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_add_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3191d5283e..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png
deleted file mode 100644
index e3517362e4..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_blur_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 36b826bb8c..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_bug_report_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png
deleted file mode 100644
index 859cdf78bb..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b060a..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_center_focus_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_center_focus_white_24dp.png
deleted file mode 100644
index cd0e1d3fb9..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_center_focus_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png
deleted file mode 100644
index f4e8257672..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_filter_none_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png
deleted file mode 100644
index e5629e54ac..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_back_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png
deleted file mode 100644
index f396bda878..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_flip_to_front_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_gps_fixed_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_gps_fixed_white_24dp.png
deleted file mode 100644
index ffab865d95..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_gps_fixed_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png
deleted file mode 100644
index 5b5fd9a19d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_location_city_black_48dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png
deleted file mode 100644
index 36859f094a..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_menu.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png
deleted file mode 100644
index 7faa3455f6..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_my_location_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_navigation_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_navigation_white_24dp.png
deleted file mode 100644
index f064261207..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_navigation_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
deleted file mode 100644
index 5cebaab818..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_pin_drop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_place_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_place_white_24dp.png
deleted file mode 100644
index 814ca8ddc4..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_place_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index ba6fbe9aff..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_trending_up_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png
deleted file mode 100644
index d1aad0bd12..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/ic_widgets_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index a84106b01f..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png
deleted file mode 100644
index d465660d97..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_blur_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index 766bac447a..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_bug_report_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png
deleted file mode 100644
index c0246cf2a6..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb55e..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_center_focus_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_center_focus_white_24dp.png
deleted file mode 100644
index d49e56e88d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_center_focus_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png
deleted file mode 100644
index 45fd67df58..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_filter_none_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png
deleted file mode 100644
index f4717be70d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_back_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png
deleted file mode 100644
index 9b78ad3780..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_flip_to_front_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_gps_fixed_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_gps_fixed_white_24dp.png
deleted file mode 100644
index 387ecdfbcb..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_gps_fixed_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png
deleted file mode 100644
index 0b2b64745d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_location_city_black_48dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png
deleted file mode 100644
index 1a5109828f..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_menu.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png
deleted file mode 100644
index d3a1ab08c8..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_my_location_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_navigation_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_navigation_white_24dp.png
deleted file mode 100644
index 05b81cb1f8..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_navigation_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
deleted file mode 100644
index abd6966825..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_pin_drop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_place_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_place_white_24dp.png
deleted file mode 100644
index 078b10d4fb..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_place_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index 78119528c2..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_trending_up_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png
deleted file mode 100644
index fd21e813e2..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/ic_widgets_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
deleted file mode 100644
index 3cb10924a0..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png
deleted file mode 100644
index 3690a1d045..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_blur_on_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png
deleted file mode 100644
index e0b5b1964c..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_bug_report_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png
deleted file mode 100644
index 3c027ef29c..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d322aa9ba..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_center_focus_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_center_focus_white_24dp.png
deleted file mode 100644
index 46c1c0a397..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_center_focus_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png
deleted file mode 100644
index 8102725a5e..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_filter_none_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png
deleted file mode 100644
index 7c3d8d3669..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_back_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png
deleted file mode 100644
index d07d0ca9ab..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_flip_to_front_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_gps_fixed_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_gps_fixed_white_24dp.png
deleted file mode 100644
index c55220a5fe..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_gps_fixed_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png
deleted file mode 100644
index f9654a9a67..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_location_city_black_48dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png
deleted file mode 100644
index c15d634671..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_menu.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png
deleted file mode 100644
index 0812b0e31d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_my_location_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_navigation_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_navigation_white_24dp.png
deleted file mode 100644
index b040e204c8..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_navigation_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
deleted file mode 100644
index 09dc9a6813..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_pin_drop_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_place_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_place_white_24dp.png
deleted file mode 100644
index 8bcb6f620d..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_place_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png
deleted file mode 100644
index 32f3a10cf1..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_trending_up_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png
deleted file mode 100644
index 00806a2fa3..0000000000
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/ic_widgets_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml
new file mode 100644
index 0000000000..6cdfce3074
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml
new file mode 100644
index 0000000000..b032703e38
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,4c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,-8c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm-3,0.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm15,5.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zm0,-3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zm-11,10c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zm7,7c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zm0,-17c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zm0,5.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zm8,0.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,4c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,-8c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,-4c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm3,8.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm0,3.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zm-4,-12c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zm0,8.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zm4,-4.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zm0,-4c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml
new file mode 100644
index 0000000000..909e11f923
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8H4v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1H4v2h2v1c0,0.34 0.04,0.67 0.09,1H4v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3H20v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1H20V8zm-6,8h-4v-2h4v2zm0,-4h-4v-2h4v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml
new file mode 100644
index 0000000000..4f72bed69c
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml
new file mode 100644
index 0000000000..f0e8643c35
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml
new file mode 100644
index 0000000000..455c18f3d1
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M5,15H3v4c0,1.1 0.9,2 2,2h4v-2H5v-4zM5,5h4V3H5c-1.1,0 -2,0.9 -2,2v4h2V5zm14,-2h-4v2h4v4h2V5c0,-1.1 -0.9,-2 -2,-2zm0,16h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2v4zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml
new file mode 100644
index 0000000000..9b16b15571
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M3,5H1v16c0,1.1 0.9,2 2,2h16v-2H3V5zm18,-4H7c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-2 -2,-2zm0,16H7V3h14v14z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml
new file mode 100644
index 0000000000..da636f975c
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M9,7H7v2h2V7zm0,4H7v2h2v-2zm0,-8c-1.11,0 -2,0.9 -2,2h2V3zm4,12h-2v2h2v-2zm6,-12v2h2c0,-1.1 -0.9,-2 -2,-2zm-6,0h-2v2h2V3zM9,17v-2H7c0,1.1 0.89,2 2,2zm10,-4h2v-2h-2v2zm0,-4h2V7h-2v2zm0,8c1.1,0 2,-0.9 2,-2h-2v2zM5,7H3v12c0,1.1 0.89,2 2,2h12v-2H5V7zm10,-2h2V3h-2v2zm0,12h2v-2h-2v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml
new file mode 100644
index 0000000000..7d78638595
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M3,13h2v-2H3v2zm0,4h2v-2H3v2zm2,4v-2H3c0,1.1 0.89,2 2,2zM3,9h2V7H3v2zm12,12h2v-2h-2v2zm4,-18H9c-1.11,0 -2,0.9 -2,2v10c0,1.1 0.89,2 2,2h10c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12H9V5h10v10zm-8,6h2v-2h-2v2zm-4,0h2v-2H7v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml
new file mode 100644
index 0000000000..a8fa0207e6
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zm8.94,3c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94V1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11H1v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94V23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94H23v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml
new file mode 100644
index 0000000000..e9bea94b41
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M15,11V5l-3,-3 -3,3v2H3v14h18V11h-6zm-8,8H5v-2h2v2zm0,-4H5v-2h2v2zm0,-4H5V9h2v2zm6,8h-2v-2h2v2zm0,-4h-2v-2h2v2zm0,-4h-2V9h2v2zm0,-4h-2V5h2v2zm6,12h-2v-2h2v2zm0,-4h-2v-2h2v2z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml
new file mode 100644
index 0000000000..8c16289f27
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml
new file mode 100644
index 0000000000..6ab15dc6b3
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,2L4.5,20.29l0.71,0.71L12,18l6.79,3 0.71,-0.71z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml
new file mode 100644
index 0000000000..9329bfc677
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8H3v8zM3,3v8h8V3H3zm13.66,-1.31L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml
new file mode 100644
index 0000000000..47aff99532
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M18,8c0,-3.31 -2.69,-6 -6,-6S6,4.69 6,8c0,4.5 6,11 6,11s6,-6.5 6,-11zm-8,0c0,-1.1 0.9,-2 2,-2s2,0.9 2,2 -0.89,2 -2,2c-1.1,0 -2,-0.9 -2,-2zM5,20v2h14v-2H5z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml
new file mode 100644
index 0000000000..e778c37c4c
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zm0,9.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml
new file mode 100644
index 0000000000..830f3036f2
--- /dev/null
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#FFFFFF"
+ android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z" />
+</vector>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
index d788a2fc63..24f83d36e2 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
- android:id="@+id/drawer_layout"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
@@ -17,47 +16,45 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/primary"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
- <FrameLayout
- android:id="@+id/content_frame"
+ <FrameLayout
+ android:id="@+id/content_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/toolbar">
+
+ <android.support.design.widget.CoordinatorLayout
+ android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/toolbar">
+ android:layout_height="match_parent">
- <android.support.design.widget.CoordinatorLayout
- android:id="@+id/coordinator_layout"
+ <com.mapbox.mapboxsdk.views.MapView
+ android:id="@+id/mainMapView"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <com.mapbox.mapboxsdk.views.MapView
- android:id="@+id/mainMapView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
+ android:layout_height="match_parent" />
- <TextView
- android:id="@+id/view_fps"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:text="@string/label_fps"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ <TextView
+ android:id="@+id/view_fps"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:text="@string/label_fps"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/locationFAB"
- android:src="@drawable/ic_my_location_black_24dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end|bottom"
- android:layout_margin="@dimen/fab_margin"
- app:backgroundTint="@color/white"
- />
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/locationFAB"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end|bottom"
+ android:layout_margin="@dimen/fab_margin"
+ android:src="@drawable/ic_gps_fixed_24dp"
+ app:backgroundTint="@color/white" />
- </android.support.design.widget.CoordinatorLayout>
+ </android.support.design.widget.CoordinatorLayout>
- </FrameLayout>
+ </FrameLayout>
</RelativeLayout>
@@ -67,6 +64,6 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
- app:menu="@menu/menu_drawer"/>
+ app:menu="@menu/menu_drawer" />
</android.support.v4.widget.DrawerLayout>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
index e0a03bbd32..649190a132 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
@@ -31,7 +31,7 @@
android:layout_alignParentRight="true"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/fab_margin"
- android:src="@drawable/ic_add_black_24dp"
+ android:src="@drawable/ic_add_24dp"
app:backgroundTint="@android:color/white" />
</RelativeLayout>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
index 9b905d3c0b..8c48894ac9 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml
@@ -8,17 +8,17 @@
<group>
<item
android:id="@+id/action_debug"
- android:icon="@drawable/ic_bug_report_white_24dp"
+ android:icon="@drawable/ic_bug_report_24dp"
android:title="@string/action_debug" />
<item
android:id="@+id/action_markers"
- android:icon="@drawable/ic_place_white_24dp"
+ android:icon="@drawable/ic_place_24dp"
android:title="@string/action_point_annotations" />
<item
android:id="@+id/action_compass"
- android:icon="@drawable/ic_navigation_white_24dp"
+ android:icon="@drawable/ic_navigation_24dp"
android:title="@string/action_compass" />
</group>
</menu>
@@ -69,56 +69,56 @@
<item
android:id="@+id/action_map_fragment"
android:checkable="false"
- android:icon="@drawable/ic_widgets_white_24dp"
+ android:icon="@drawable/ic_now_widgets_24dp"
android:title="@string/action_map_fragment" />
<item
android:id="@+id/action_info_window"
android:checkable="false"
- android:icon="@drawable/ic_flip_to_front_white_24dp"
+ android:icon="@drawable/ic_flip_to_front_24dp"
android:title="@string/action_info_window" />
<item
android:id="@+id/action_info_window_adapter"
android:checkable="false"
- android:icon="@drawable/ic_flip_to_back_white_24dp"
+ android:icon="@drawable/ic_flip_to_back_24dp"
android:title="@string/action_info_window_adapter" />
<item
android:id="@+id/action_press_for_marker"
android:checkable="false"
- android:icon="@drawable/ic_pin_drop_white_24dp"
+ android:icon="@drawable/ic_pin_drop_24dp"
android:title="@string/action_press_for_marker" />
<item
android:id="@+id/action_manual_zoom"
android:checkable="false"
- android:icon="@drawable/ic_filter_center_focus_white_24dp"
- android:title="@string/action_manual_zoom"/>
+ android:icon="@drawable/ic_filter_center_focus_24dp"
+ android:title="@string/action_manual_zoom" />
<item
android:id="@+id/action_visible_bounds"
android:checkable="false"
- android:icon="@drawable/ic_crop_white_24dp"
+ android:icon="@drawable/ic_crop_24dp"
android:title="@string/action_visible_bounds" />
<item
android:id="@+id/action_bulk_markers"
android:checkable="false"
- android:icon="@drawable/ic_blur_on_white_24dp"
+ android:icon="@drawable/ic_blur_on_24dp"
android:title="@string/action_add_bulk_markers" />
<item
android:id="@+id/action_user_tracking_mode"
android:checkable="false"
- android:icon="@drawable/ic_gps_fixed_white_24dp"
+ android:icon="@drawable/ic_gps_fixed_24dp"
android:title="@string/activity_user_tracking_mode" />
<item
android:id="@+id/action_polyline"
android:checkable="false"
- android:icon="@drawable/ic_trending_up_white_24dp"
- android:title="@string/activity_polyline"/>
+ android:icon="@drawable/ic_trending_up_24dp"
+ android:title="@string/activity_polyline" />
</menu>
</item>
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
index d419fb0b26..3590d0c68b 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml
@@ -3,7 +3,7 @@
xmlns:mapbox="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_id_remove"
- android:icon="@drawable/ic_delete_white_24dp"
+ android:icon="@drawable/ic_delete_24dp"
android:title="@string/action_remove_polylines"
mapbox:showAsAction="ifRoom" />
</menu> \ No newline at end of file
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
index 9248bc7d00..e781e337d6 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/accent</item>
+ <item name="android:windowBackground">@android:color/white</item>
</style>
</resources>
diff --git a/android/build.gradle b/android/build.gradle
index 32fa8c58d5..3a9b035a56 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
// NOTE: Do not place your application dependencies here; they belong