diff --git a/.gitignore b/.gitignore
index 60faa8d40..4f141109d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ build
 gradlew.bat
 *.properties
 src/main/res/
+MapboxAndroidDemo/google-services.json
+
diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
index c9d895acc..7621a3f2e 100644
--- a/MapboxAndroidDemo/build.gradle
+++ b/MapboxAndroidDemo/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'io.fabric'
 apply from: "$project.rootDir/gradle/script-git-version.gradle"
 apply from: "$project.rootDir/gradle/gradle-dependencies-graph.gradle"
 
@@ -38,7 +39,7 @@ android {
         buildConfigField "int", "MIN_SDK_VERSION", "$minSdkVersion.apiLevel"
 
         playAccountConfig = playAccountConfigs.defaultAccountConfig
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     flavorDimensions "default"
@@ -72,6 +73,7 @@ android {
             applicationIdSuffix '.debug'
             versionNameSuffix '-Debug'
             minifyEnabled false
+            ext.enableCrashlytics = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
@@ -107,17 +109,16 @@ if (isGlobal) {
 dependencies {
 
     // Wearable application module
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     globalWearApp project(':MapboxAndroidWearDemo')
 
     // Support libraries
     implementation dependenciesList.supportGridLayout
+    implementation dependenciesList.supportAppcompatV4
     implementation dependenciesList.supportAppcompatV7
     implementation dependenciesList.supportCardView
     implementation dependenciesList.supportRecyclerView
-    implementation dependenciesList.supportDesign
+    implementation dependenciesList.supportMaterialDesign
     implementation dependenciesList.supportCustomTabs
-    implementation dependenciesList.supportV4
     implementation dependenciesList.supportConstraintLayout
     implementation dependenciesList.supportAnimation
 
@@ -137,8 +138,9 @@ dependencies {
     implementation dependenciesList.mapboxPluginScalebar
 
     // Firebase
-    globalImplementation dependenciesList.firebaseCrash
+    globalImplementation dependenciesList.firebaseCore
     globalImplementation dependenciesList.firebasePerf
+    globalImplementation dependenciesList.firebaseCrashlytics
 
     // Other dependencies
     implementation dependenciesList.gson
@@ -169,4 +171,4 @@ dependencies {
 }
 
 apply from: "${rootDir}/gradle/checkstyle.gradle"
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android-extensions'
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseActivityTest.java b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseActivityTest.java
index a79f104ef..1c192be17 100644
--- a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseActivityTest.java
+++ b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseActivityTest.java
@@ -4,9 +4,6 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingResourceTimeoutException;
-import android.support.test.rule.ActivityTestRule;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -19,12 +16,15 @@
 import org.junit.Before;
 import org.junit.Rule;
 
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingResourceTimeoutException;
+import androidx.test.rule.ActivityTestRule;
 import timber.log.Timber;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
 
 public abstract class BaseActivityTest {
diff --git a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
index 26a3a2e4a..8532278b2 100644
--- a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
+++ b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/action/WaitAction.java
@@ -1,12 +1,13 @@
 package com.mapbox.mapboxsdk.testapp.action;
 
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
 import android.view.View;
 
 import org.hamcrest.Matcher;
 
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 
 public final class WaitAction implements ViewAction {
 
diff --git a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity.junit.ejs b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity.junit.ejs
index cd80946d8..4ccb83760 100644
--- a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity.junit.ejs
+++ b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity.junit.ejs
@@ -9,7 +9,8 @@ import com.mapbox.mapboxandroiddemo.examples.<%- subPackage %>.<%- activity %>;
 import com.mapbox.mapboxsdk.testapp.BaseActivityTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 /**
  * Sanity test for <%- activity %>
diff --git a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
index 0e2e4587e..4ede6c7ca 100644
--- a/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
+++ b/MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
@@ -1,7 +1,6 @@
 package com.mapbox.mapboxsdk.testapp.utils;
 
 import android.app.Activity;
-import android.support.test.espresso.IdlingResource;
 
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
@@ -9,6 +8,8 @@
 
 import java.lang.reflect.Field;
 
+import androidx.test.espresso.IdlingResource;
+
 public class OnMapReadyIdlingResource implements IdlingResource, OnMapReadyCallback {
 
   private MapboxMap mapboxMap;
diff --git a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/MainActivity.java b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/MainActivity.java
index dcf587d53..8bde7cd13 100644
--- a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/MainActivity.java
+++ b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/MainActivity.java
@@ -6,15 +6,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
index e433e0329..9db74dbb8 100644
--- a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
+++ b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
@@ -4,10 +4,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/examples/SimpleChinaMapViewActivity.java b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/examples/SimpleChinaMapViewActivity.java
index cbc60d367..c274ede5a 100644
--- a/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/examples/SimpleChinaMapViewActivity.java
+++ b/MapboxAndroidDemo/src/china/java/com/mapbox/mapboxandroiddemo/examples/SimpleChinaMapViewActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.annotation.NonNull;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_animated_image_gif.xml b/MapboxAndroidDemo/src/china/res/layout/activity_animated_image_gif.xml
index f6ee61511..e6d5a7d8f 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_animated_image_gif.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_animated_image_gif.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraZoom="3.5"
         />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_building_plugin.xml b/MapboxAndroidDemo/src/china/res/layout/activity_building_plugin.xml
index 184390048..ee02a1f6c 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_building_plugin.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_building_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,7 +17,7 @@
         mapbox:mapbox_cameraTilt="60"
         mapbox:mapbox_cameraZoom="16" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabBuilding"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -99,4 +99,4 @@
 
     </LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_extrusion_light.xml b/MapboxAndroidDemo/src/china/res/layout/activity_extrusion_light.xml
index f8ce494ac..79b450769 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_extrusion_light.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_extrusion_light.xml
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraZoom="16"
         />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabLightPosition"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
         mapbox:backgroundTint="@color/mapboxPink"
         mapbox:layout_anchorGravity="top"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabLightColor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_image_source.xml b/MapboxAndroidDemo/src/china/res/layout/activity_image_source.xml
index 27bb4ed4d..4a8ae9fd2 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_image_source.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_image_source.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraZoom="12"
         />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_image_source_time_lapse.xml b/MapboxAndroidDemo/src/china/res/layout/activity_image_source_time_lapse.xml
index 2d213a90d..022c44fc7 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_image_source_time_lapse.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_image_source_time_lapse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraZoom="4.3"
         />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_info_window_symbol_layer.xml b/MapboxAndroidDemo/src/china/res/layout/activity_info_window_symbol_layer.xml
index 1312a2a04..2701e315b 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_info_window_symbol_layer.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_info_window_symbol_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraZoom="3.853171"
          />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_lab_indoor_map.xml b/MapboxAndroidDemo/src/china/res/layout/activity_lab_indoor_map.xml
index 79f7110ad..a42aa138f 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_lab_indoor_map.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_lab_indoor_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -39,4 +39,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_lab_pulsing_layer_opacity_color.xml b/MapboxAndroidDemo/src/china/res/layout/activity_lab_pulsing_layer_opacity_color.xml
index 8dd5a078a..dd4bc5545 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_lab_pulsing_layer_opacity_color.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_lab_pulsing_layer_opacity_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -53,4 +53,4 @@
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_lab_recycler_view_on_map.xml b/MapboxAndroidDemo/src/china/res/layout/activity_lab_recycler_view_on_map.xml
index ca822908d..43e4c5701 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_lab_recycler_view_on_map.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_lab_recycler_view_on_map.xml
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraZoom="12"
         />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_localization_plugin.xml b/MapboxAndroidDemo/src/china/res/layout/activity_localization_plugin.xml
index e2d2d000e..cf8b2def7 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_localization_plugin.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_localization_plugin.xml
@@ -13,11 +13,11 @@
         app:mapbox_cameraTargetLng="136.711369"
         app:mapbox_cameraZoom="4.5257" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_one_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,9 +35,9 @@
                 android:text="@string/arabic"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_two_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -54,10 +54,10 @@
                 android:text="@string/russian"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_three_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,11 +74,11 @@
                 android:text="@string/chinese"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/match_map_to_device_language"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_multiple_heatmap_styling.xml b/MapboxAndroidDemo/src/china/res/layout/activity_multiple_heatmap_styling.xml
index c0c432d97..e214791cf 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_multiple_heatmap_styling.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_multiple_heatmap_styling.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/switch_heatmap_style_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_picture_in_picture.xml b/MapboxAndroidDemo/src/china/res/layout/activity_picture_in_picture.xml
index ffd272b79..dfe290473 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_picture_in_picture.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_picture_in_picture.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                              xmlns:mapbox="http://schemas.android.com/apk/res-auto"
                                              xmlns:tools="http://schemas.android.com/tools"
                                              android:layout_width="match_parent"
                                              android:layout_height="match_parent"
                                              android:orientation="vertical">
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_window_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,4 +30,4 @@
         tools:layout_editor_absoluteY="8dp"/>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_places_plugin.xml b/MapboxAndroidDemo/src/china/res/layout/activity_places_plugin.xml
index ab8018bc5..ec770c6a5 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_places_plugin.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_places_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraZoom="0.346515"
         />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_location_search"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,4 +23,4 @@
         app:backgroundTint="@color/colorPrimary"
         app:srcCompat="@android:drawable/ic_search_category_default" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_query_feature_count.xml b/MapboxAndroidDemo/src/china/res/layout/activity_query_feature_count.xml
index f8b5384ae..fbb9618e7 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_query_feature_count.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_query_feature_count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -30,4 +30,4 @@
 
     </RelativeLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/china/res/layout/activity_symbol_layer_mapillary.xml b/MapboxAndroidDemo/src/china/res/layout/activity_symbol_layer_mapillary.xml
index 5dd936ac7..c6b5a5bd2 100644
--- a/MapboxAndroidDemo/src/china/res/layout/activity_symbol_layer_mapillary.xml
+++ b/MapboxAndroidDemo/src/china/res/layout/activity_symbol_layer_mapillary.xml
@@ -14,7 +14,7 @@
         mapbox:mapbox_cameraTilt="25"
         mapbox:mapbox_cameraZoom="11" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="178dp"
diff --git a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java
index 82a9b457e..2093e6d3d 100644
--- a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java
+++ b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java
@@ -6,15 +6,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MapboxApplication.java b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MapboxApplication.java
index 1670b7a59..dc76916b0 100644
--- a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MapboxApplication.java
+++ b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MapboxApplication.java
@@ -1,15 +1,15 @@
 package com.mapbox.mapboxandroiddemo;
 
-import android.support.multidex.MultiDexApplication;
-
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
+import com.crashlytics.android.Crashlytics;
+import com.crashlytics.android.core.CrashlyticsCore;
 import com.mapbox.mapboxandroiddemo.utils.TileLoadingInterceptor;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.module.http.HttpRequestUtil;
 import com.squareup.picasso.OkHttpDownloader;
 import com.squareup.picasso.Picasso;
 
+import androidx.multidex.MultiDexApplication;
+import io.fabric.sdk.android.Fabric;
 import okhttp3.OkHttpClient;
 
 public class MapboxApplication extends MultiDexApplication {
@@ -17,19 +17,11 @@ public class MapboxApplication extends MultiDexApplication {
   @Override
   public void onCreate() {
     super.onCreate();
-    initializeFirebaseApp();
     setUpPicasso();
     Mapbox.getInstance(this, getString(R.string.access_token));
     Mapbox.getTelemetry().setDebugLoggingEnabled(true);
     setUpTileLoadingMeasurement();
-  }
-
-  private void initializeFirebaseApp() {
-    FirebaseApp.initializeApp(this, new FirebaseOptions.Builder()
-      .setApiKey(getString(R.string.firebase_api_key))
-      .setApplicationId(getString(R.string.firebase_app_id))
-      .build()
-    );
+    setUpCrashlytics();
   }
 
   private void setUpPicasso() {
@@ -46,4 +38,12 @@ private void setUpTileLoadingMeasurement() {
       .build();
     HttpRequestUtil.setOkHttpClient(okHttpClient);
   }
+
+  private void setUpCrashlytics() {
+    Fabric.with(this, new Crashlytics.Builder()
+        .core(new CrashlyticsCore.Builder()
+            .disabled(BuildConfig.DEBUG)
+            .build())
+        .build());
+  }
 }
diff --git a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
index 3ed8151ca..e16968389 100644
--- a/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
+++ b/MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java
@@ -4,9 +4,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/AndroidManifest.xml b/MapboxAndroidDemo/src/main/AndroidManifest.xml
index 257462c7d..02e1f543f 100644
--- a/MapboxAndroidDemo/src/main/AndroidManifest.xml
+++ b/MapboxAndroidDemo/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.mapboxandroiddemo">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -23,6 +24,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:launchMode="singleTop"
+        tools:replace="android:appComponentFactory"
+        android:appComponentFactory="placeholderString"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
@@ -930,6 +933,7 @@
         <meta-data
             android:name="com.mapbox.EnableSkuToken"
             android:value="true" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/AccountRetrievalService.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/AccountRetrievalService.java
index 036ec717a..4dfee50ec 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/AccountRetrievalService.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/AccountRetrievalService.java
@@ -5,8 +5,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Base64;
 import android.util.Log;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LoadingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LoadingActivity.java
index e09801ff7..ee7d3d3a0 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LoadingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LoadingActivity.java
@@ -1,7 +1,7 @@
 package com.mapbox.mapboxandroiddemo.account;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
index d26a3fd8e..86baf56cd 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
@@ -1,10 +1,10 @@
 package com.mapbox.mapboxandroiddemo.adapter;
 
 import android.content.Context;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/KotlinSimpleMapViewActivity.kt b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/KotlinSimpleMapViewActivity.kt
index 345375d63..032729933 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/KotlinSimpleMapViewActivity.kt
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/KotlinSimpleMapViewActivity.kt
@@ -1,7 +1,7 @@
 package com.mapbox.mapboxandroiddemo.examples.basics
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.mapboxandroiddemo.R
 import com.mapbox.mapboxsdk.Mapbox
 import com.mapbox.mapboxsdk.maps.Style
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/MapboxMapOptionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/MapboxMapOptionActivity.java
index 89cb550f6..412d399f7 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/MapboxMapOptionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/MapboxMapOptionActivity.java
@@ -1,8 +1,6 @@
 package com.mapbox.mapboxandroiddemo.examples.basics;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
@@ -14,6 +12,9 @@
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Style;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Add a map view in a dynamically created layout
  */
@@ -29,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
     // object or in the same activity which contains the mapview.
     Mapbox.getInstance(this, getString(R.string.access_token));
 
-    MapboxMapOptions options = new MapboxMapOptions()
+    MapboxMapOptions options = MapboxMapOptions.createFromAttributes(this, null)
       .camera(new CameraPosition.Builder()
         .target(new LatLng(43.7383, 7.4094))
         .zoom(12)
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SimpleMapViewActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SimpleMapViewActivity.java
index e3b19108c..a44321e00 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SimpleMapViewActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SimpleMapViewActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.basics;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SupportMapFragmentActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SupportMapFragmentActivity.java
index 9f1b43d35..ee1507597 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SupportMapFragmentActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SupportMapFragmentActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.basics;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
@@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
       final FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
       // Build mapboxMap
-      MapboxMapOptions options = new MapboxMapOptions();
+      MapboxMapOptions options = MapboxMapOptions.createFromAttributes(this, null);
       options.camera(new CameraPosition.Builder()
         .target(new LatLng(-52.6885, -70.1395))
         .zoom(9)
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/AnimateMapCameraActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/AnimateMapCameraActivity.java
index 78fae937c..b28fccc86 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/AnimateMapCameraActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/AnimateMapCameraActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.camera;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/BoundingBoxCameraActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/BoundingBoxCameraActivity.java
index 7d1498a35..96b9e8f4e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/BoundingBoxCameraActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/BoundingBoxCameraActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.camera;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/RestrictCameraActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/RestrictCameraActivity.java
index ec33b1427..8a518d67e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/RestrictCameraActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/RestrictCameraActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/SlowlyRotatingCameraActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/SlowlyRotatingCameraActivity.java
index 729d51b17..21e46bb3e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/SlowlyRotatingCameraActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/camera/SlowlyRotatingCameraActivity.java
@@ -2,8 +2,8 @@
 
 import android.animation.ValueAnimator;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.animation.LinearInterpolator;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/AddRainFallStyleActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/AddRainFallStyleActivity.java
index b28506d82..3696ee73e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/AddRainFallStyleActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/AddRainFallStyleActivity.java
@@ -2,8 +2,8 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java
index 900391473..1684f903d 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/BathymetryActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java
index f2f4d0384..4dd5c7669 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethJsonVectorMixActivity.java
@@ -2,9 +2,9 @@
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethZoomChangeActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethZoomChangeActivity.java
index f5235ef68..1f729fc8e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethZoomChangeActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ChoroplethZoomChangeActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java
index 056eab3b1..836026338 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleLayerClusteringActivity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleRadiusActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleRadiusActivity.java
index 1948f2def..826011b63 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleRadiusActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CircleRadiusActivity.java
@@ -2,8 +2,6 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
@@ -14,6 +12,9 @@
 import com.mapbox.mapboxsdk.style.layers.CircleLayer;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential;
 import static com.mapbox.mapboxsdk.style.expressions.Expression.get;
 import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java
index b933fa914..8c2c6aad2 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/CreateHotspotsActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java
index 5c5a10259..96cc7666d 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.FeatureCollection;
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java
index cbc2e90cd..d5d531745 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawPolygonActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Point;
 import com.mapbox.geojson.Polygon;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
index 50d898bf5..c6899e4d9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java
@@ -5,10 +5,10 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/HeatmapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/HeatmapActivity.java
index 325d84cc3..08ba49387 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/HeatmapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/HeatmapActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java
index 44019fadb..d16ff5163 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ImageClusteringActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/InfoWindowSymbolLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/InfoWindowSymbolLayerActivity.java
index 392d81e10..8c021b3bd 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/InfoWindowSymbolLayerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/InfoWindowSymbolLayerActivity.java
@@ -8,8 +8,8 @@
 import android.graphics.PointF;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/KotlinStyleCirclesCategoricallyActivity.kt b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/KotlinStyleCirclesCategoricallyActivity.kt
index 91b28316e..5dee17641 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/KotlinStyleCirclesCategoricallyActivity.kt
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/KotlinStyleCirclesCategoricallyActivity.kt
@@ -1,7 +1,7 @@
 package com.mapbox.mapboxandroiddemo.examples.dds
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.mapbox.mapboxandroiddemo.R
 import com.mapbox.mapboxsdk.Mapbox
 import com.mapbox.mapboxsdk.maps.Style
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/LineGradientActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/LineGradientActivity.java
index e885a2ec1..5d73075a6 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/LineGradientActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/LineGradientActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleGeometriesActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleGeometriesActivity.java
index a90fc0b3c..89d91a5c1 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleGeometriesActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleGeometriesActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java
index 5c80d300c..6e651a3a1 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/MultipleHeatmapStylingActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonHolesActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonHolesActivity.java
index 8745edded..f8ebe7d59 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonHolesActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonHolesActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.LineString;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonSelectToggleActivity.kt b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonSelectToggleActivity.kt
index ed117cf17..165c49e85 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonSelectToggleActivity.kt
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/PolygonSelectToggleActivity.kt
@@ -6,7 +6,7 @@ import android.graphics.Color
 import android.graphics.PointF
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.widget.Toast
 import com.mapbox.geojson.Feature
 import com.mapbox.geojson.FeatureCollection
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/RevealedPolygonHoleOutlineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/RevealedPolygonHoleOutlineActivity.java
index 52406320c..25a8f31d4 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/RevealedPolygonHoleOutlineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/RevealedPolygonHoleOutlineActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.LineString;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SatelliteLandSelectActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SatelliteLandSelectActivity.java
index e651cbdc6..72daa94f5 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SatelliteLandSelectActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SatelliteLandSelectActivity.java
@@ -3,9 +3,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleCirclesCategoricallyActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleCirclesCategoricallyActivity.java
index 6fca15bda..bd183abd7 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleCirclesCategoricallyActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleCirclesCategoricallyActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java
index 64022c263..921c2a598 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/StyleLineIdentityPropertyActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolCollisionDetectionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolCollisionDetectionActivity.java
index 37b1330ff..bcd4a3051 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolCollisionDetectionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolCollisionDetectionActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolSwitchOnZoomActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolSwitchOnZoomActivity.java
index 2f14a47da..411dae221 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolSwitchOnZoomActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/SymbolSwitchOnZoomActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.dds;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/AdjustExtrusionLightActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/AdjustExtrusionLightActivity.java
index 2fd2cad14..9ff002707 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/AdjustExtrusionLightActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/AdjustExtrusionLightActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/Indoor3DMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/Indoor3DMapActivity.java
index f196be387..2199378b9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/Indoor3DMapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/Indoor3DMapActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.extrusions;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/MarathonExtrusionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/MarathonExtrusionActivity.java
index 80ef995af..effd9b3b1 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/MarathonExtrusionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/MarathonExtrusionActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java
index c995bd326..0cd40c203 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/PopulationDensityExtrusionActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.extrusions;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java
index 681711867..c26a18457 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/extrusions/RotationExtrusionActivity.java
@@ -7,8 +7,8 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java
index 0f31dba59..5fd4e0aa9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/DirectionsActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.api.directions.v5.DirectionsCriteria;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/GeocodingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/GeocodingActivity.java
index 8083b96c9..03b6331d6 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/GeocodingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/GeocodingActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.javaservices;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.ListPopupWindow;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ListPopupWindow;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java
index 183015405..2c9c0e14c 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneSeekbarActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneSeekbarActivity.java
index 28133dc01..771776f65 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneSeekbarActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/IsochroneSeekbarActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.javaservices;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java
index 9c3a5dd47..062d03baa 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MapMatchingActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.api.matching.v5.MapboxMapMatching;
 import com.mapbox.api.matching.v5.models.MapMatchingMatching;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java
index f7a5b714d..39321cfd3 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/MatrixApiActivity.java
@@ -2,14 +2,14 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSnapHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SnapHelper;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java
index df05ddecb..35cdc5af3 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/OptimizationActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.api.directions.v5.DirectionsCriteria;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java
index 6157400bd..9b0441af1 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/SimplifyPolylineActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java
index 0ce562d50..b3be12079 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/StaticImageActivity.java
@@ -2,8 +2,8 @@
 
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TilequeryActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TilequeryActivity.java
index 8f46e876b..fcee5b025 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TilequeryActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TilequeryActivity.java
@@ -3,8 +3,8 @@
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TurfRingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TurfRingActivity.java
index 6fa145390..02fa71ef8 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TurfRingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/javaservices/TurfRingActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.LineString;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedImageGifActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedImageGifActivity.java
index b54a9e047..ab2ea16d6 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedImageGifActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedImageGifActivity.java
@@ -5,8 +5,8 @@
 import android.graphics.Movie;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java
index 6e0541a6f..56c638146 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/AnimatedMarkerActivity.java
@@ -5,8 +5,8 @@
 import android.animation.ValueAnimator;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/CalendarIntegrationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/CalendarIntegrationActivity.java
index b2bf7276c..7468f7793 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/CalendarIntegrationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/CalendarIntegrationActivity.java
@@ -13,10 +13,10 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.CalendarContract;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.android.core.permissions.PermissionsListener;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java
index 539aa857f..6c7288ba9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/HomeScreenWidgetActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/HomeScreenWidgetActivity.java
index 6e1961998..10005f4bd 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/HomeScreenWidgetActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/HomeScreenWidgetActivity.java
@@ -1,7 +1,7 @@
 package com.mapbox.mapboxandroiddemo.examples.labs;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java
index 6ab251aa3..090fea47b 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/IndoorMapActivity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.widget.Button;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java
index 5465eae34..5c4d39995 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/InsetMapActivity.java
@@ -1,9 +1,6 @@
 package com.mapbox.mapboxandroiddemo.examples.labs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
@@ -17,6 +14,10 @@
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.maps.SupportMapFragment;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 public class InsetMapActivity extends AppCompatActivity {
 
   private static final String STYLE_URL = "mapbox://styles/mapbox/cj5l80zrp29942rmtg0zctjto";
@@ -50,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
       final FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
       // Build map fragment options
-      MapboxMapOptions options = new MapboxMapOptions();
+      MapboxMapOptions options = MapboxMapOptions.createFromAttributes(this, null);
       options.attributionEnabled(false);
       options.logoEnabled(false);
       options.compassEnabled(false);
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java
index 78d7466ef..ba0be45ff 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/LocationPickerActivity.java
@@ -2,9 +2,9 @@
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MagicWindowKotlinActivity.kt b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MagicWindowKotlinActivity.kt
index b890ffec2..9d59a172c 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MagicWindowKotlinActivity.kt
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MagicWindowKotlinActivity.kt
@@ -6,10 +6,10 @@ import android.content.pm.PackageManager
 import android.graphics.*
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.RequiresApi
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AppCompatActivity
+import androidx.annotation.RequiresApi
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.MotionEvent
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MapFogBackgroundActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MapFogBackgroundActivity.java
index 87ebfbd70..85161442d 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MapFogBackgroundActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MapFogBackgroundActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.labs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java
index 7b0ab479a..5adf1279a 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MarkerFollowingRouteActivity.java
@@ -7,9 +7,9 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.animation.LinearInterpolator;
 
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java
index 94675ce5f..2436327f7 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/MovingIconWithTrailingLineActivity.java
@@ -7,8 +7,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.animation.LinearInterpolator;
 import android.widget.Toast;
 import com.mapbox.api.directions.v5.DirectionsCriteria;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PictureInPictureActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PictureInPictureActivity.java
index 55e96fd84..bd3d8037e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PictureInPictureActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PictureInPictureActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.labs;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PulsingLayerOpacityColorActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PulsingLayerOpacityColorActivity.java
index 66e236793..2082d1a21 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PulsingLayerOpacityColorActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/PulsingLayerOpacityColorActivity.java
@@ -4,9 +4,9 @@
 import android.animation.ValueAnimator;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.getbase.floatingactionbutton.FloatingActionButton;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewDirectionsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewDirectionsActivity.java
index a8557e0a9..799d23652 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewDirectionsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewDirectionsActivity.java
@@ -3,13 +3,13 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSnapHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewOnMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewOnMapActivity.java
index 070812006..08ee571da 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewOnMapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewOnMapActivity.java
@@ -2,14 +2,14 @@
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSnapHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SnapHelper;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java
index 9346577fe..ec66a386c 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SnakingDirectionsRouteActivity.java
@@ -4,8 +4,8 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.api.directions.v5.DirectionsCriteria;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java
index d0dc62429..51d1528c9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SpaceStationLocationActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SymbolLayerMapillaryActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SymbolLayerMapillaryActivity.java
index 272996867..254d5086f 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SymbolLayerMapillaryActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/SymbolLayerMapillaryActivity.java
@@ -17,16 +17,16 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SnapHelper;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -73,7 +73,7 @@
 import okhttp3.Response;
 import timber.log.Timber;
 
-import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
 import static com.mapbox.mapboxsdk.style.expressions.Expression.all;
 import static com.mapbox.mapboxsdk.style.expressions.Expression.eq;
 import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/ValueAnimatorIconAnimationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/ValueAnimatorIconAnimationActivity.java
index 0cfd994d6..58b7f8a58 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/ValueAnimatorIconAnimationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/ValueAnimatorIconAnimationActivity.java
@@ -3,8 +3,8 @@
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.BounceInterpolator;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/KotlinLocationComponentActivity.kt b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/KotlinLocationComponentActivity.kt
index 3baeed10d..d20de7d5a 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/KotlinLocationComponentActivity.kt
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/KotlinLocationComponentActivity.kt
@@ -3,8 +3,8 @@ package com.mapbox.mapboxandroiddemo.examples.location
 import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import android.widget.Toast
 import com.mapbox.android.core.permissions.PermissionsListener
 import com.mapbox.android.core.permissions.PermissionsManager
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationChangeListeningActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationChangeListeningActivity.java
index 90dab71a9..09d50771b 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationChangeListeningActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationChangeListeningActivity.java
@@ -1,10 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.location;
 
+
 import android.annotation.SuppressLint;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -29,12 +28,14 @@
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Use the Mapbox Core Library to receive updates when the device changes location.
  */
 public class LocationChangeListeningActivity extends AppCompatActivity implements
-        OnMapReadyCallback, PermissionsListener {
+    OnMapReadyCallback, PermissionsListener {
 
   private static final long DEFAULT_INTERVAL_IN_MILLISECONDS = 1000L;
   private static final long DEFAULT_MAX_WAIT_TIME = DEFAULT_INTERVAL_IN_MILLISECONDS * 5;
@@ -87,7 +88,7 @@ private void enableLocationComponent(@NonNull Style loadedMapStyle) {
       // Set the LocationComponent activation options
       LocationComponentActivationOptions locationComponentActivationOptions =
               LocationComponentActivationOptions.builder(this, loadedMapStyle)
-                      .useDefaultLocationEngine(false)
+                  .useDefaultLocationEngine(false)
                       .build();
 
       // Activate with the LocationComponentActivationOptions object
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentActivity.java
index 744de4d75..3ba7e286f 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.location;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.android.core.permissions.PermissionsListener;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentCameraOptionsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentCameraOptionsActivity.java
index 48332dbe1..ea3846ac9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentCameraOptionsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentCameraOptionsActivity.java
@@ -3,9 +3,9 @@
 import android.annotation.SuppressLint;
 import android.location.Location;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.ListPopupWindow;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ListPopupWindow;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentFragmentActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentFragmentActivity.java
index e5359d7aa..26995ed4e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentFragmentActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentFragmentActivity.java
@@ -1,9 +1,6 @@
 package com.mapbox.mapboxandroiddemo.examples.location;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.android.core.permissions.PermissionsListener;
@@ -24,6 +21,10 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 public class LocationComponentFragmentActivity extends AppCompatActivity implements PermissionsListener {
 
   private MapboxMap mapboxMap;
@@ -46,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
       final FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
       // Build a Mapbox map
-      MapboxMapOptions options = new MapboxMapOptions();
+      MapboxMapOptions options = MapboxMapOptions.createFromAttributes(this, null);
       options.camera(new CameraPosition.Builder()
         .target(new LatLng(38.899895, -77.03401))
         .zoom(9)
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentOptionsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentOptionsActivity.java
index 243aa2e38..c5a6a436b 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentOptionsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/location/LocationComponentOptionsActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java
index 8b6dc93ec..62c41115e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/OfflineManagerActivity.java
@@ -3,8 +3,8 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java
index 56926d393..96b85c275 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/offline/SimpleOfflineMapActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.offline;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/BuildingPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/BuildingPluginActivity.java
index 6b243ce62..d9dbc2d26 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/BuildingPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/BuildingPluginActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java
index 79715698d..a127efb81 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java
index 16788ec71..15c702145 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/MarkerViewPluginActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlaceSelectionPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlaceSelectionPluginActivity.java
index 6e8ea0081..c727ffa64 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlaceSelectionPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlaceSelectionPluginActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlacesPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlacesPluginActivity.java
index 23fc93680..e958fa0a6 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlacesPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/PlacesPluginActivity.java
@@ -5,8 +5,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.google.gson.JsonObject;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/ScalebarPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/ScalebarPluginActivity.java
index 279be6bae..3a94b097e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/ScalebarPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/ScalebarPluginActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java
index a6477c612..cb35408f7 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/SymbolListenerActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/TrafficPluginActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/TrafficPluginActivity.java
index e122b6cb0..ad1cfe191 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/TrafficPluginActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/TrafficPluginActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.plugins;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/BuildingOutlineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/BuildingOutlineActivity.java
index e4e3143cf..796276245 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/BuildingOutlineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/BuildingOutlineActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java
index 72b061c2f..88101a7da 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/ClickOnLayerActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FeatureCountActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FeatureCountActivity.java
index 3fdf7a0d8..130a6bb85 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FeatureCountActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FeatureCountActivity.java
@@ -3,9 +3,9 @@
 import android.graphics.Color;
 import android.graphics.RectF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FingerDrawQueryActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FingerDrawQueryActivity.java
index 8076de28e..897c4e3ca 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FingerDrawQueryActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/FingerDrawQueryActivity.java
@@ -5,9 +5,9 @@
 import android.graphics.PointF;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java
index f60cd91cb..e119a1259 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/HighlightedLineActivity.java
@@ -4,8 +4,8 @@
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/QueryFeatureActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/QueryFeatureActivity.java
index 1399c4a08..f9ca401e9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/QueryFeatureActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/QueryFeatureActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.google.gson.JsonElement;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/RedoSearchInAreaActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/RedoSearchInAreaActivity.java
index b1beb0b8c..e2250ce6c 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/RedoSearchInAreaActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/RedoSearchInAreaActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.Color;
 import android.graphics.RectF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/SelectBuildingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/SelectBuildingActivity.java
index 3ef7c4367..8e88a5ee1 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/SelectBuildingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/query/SelectBuildingActivity.java
@@ -3,8 +3,8 @@
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotNotificationActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotNotificationActivity.java
index bbf8e8ed7..2a4cf6da5 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotNotificationActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotNotificationActivity.java
@@ -8,9 +8,9 @@
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.MainActivity;
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotShareActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotShareActivity.java
index 2671c770d..0bffd1653 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotShareActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/snapshot/SnapshotShareActivity.java
@@ -6,9 +6,9 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StrictMode;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java
index 4f62d8ca9..adc189afa 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AdjustLayerOpacityActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AdjustLayerOpacityActivity.java
index 02aae2010..4b195d5d9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AdjustLayerOpacityActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AdjustLayerOpacityActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java
index 5d072734e..819096b07 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/BasicSymbolLayerActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java
index 310f1fa90..eb05ef97a 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ClickToAddImageActivity.java
@@ -7,8 +7,8 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.geojson.Feature;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ColorSwitcherActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ColorSwitcherActivity.java
index 91f72c030..d84d8154e 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ColorSwitcherActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ColorSwitcherActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.SeekBar;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/DefaultStyleActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/DefaultStyleActivity.java
index 824ae077d..5c84d926f 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/DefaultStyleActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/DefaultStyleActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/GeojsonLayerInStackActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/GeojsonLayerInStackActivity.java
index 3d5ec74c2..1050d0f40 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/GeojsonLayerInStackActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/GeojsonLayerInStackActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java
index 1e7d487d6..c3f44ea93 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/HillShadeActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/IconSizeChangeOnClickActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/IconSizeChangeOnClickActivity.java
index 630a138f9..6bc82da02 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/IconSizeChangeOnClickActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/IconSizeChangeOnClickActivity.java
@@ -4,8 +4,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceActivity.java
index 9bafd7f56..a599fb200 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceTimeLapseActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceTimeLapseActivity.java
index 753506754..20c0f1adc 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceTimeLapseActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ImageSourceTimeLapseActivity.java
@@ -2,8 +2,8 @@
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java
index 482780b26..0d9337536 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LineLayerActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LineLayerActivity.java
index c34110cc6..a82c2aa15 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LineLayerActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LineLayerActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LocalStyleSourceActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LocalStyleSourceActivity.java
index 4329564aa..150a72dca 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LocalStyleSourceActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LocalStyleSourceActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MapboxStudioStyleActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MapboxStudioStyleActivity.java
index 79fca9fd9..4f62cf0e8 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MapboxStudioStyleActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MapboxStudioStyleActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MissingIconActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MissingIconActivity.java
index 2a60db234..aaf3f14aa 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MissingIconActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/MissingIconActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.geojson.Feature;
 import com.mapbox.geojson.FeatureCollection;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RotatingTextAnchorPositionActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RotatingTextAnchorPositionActivity.java
index 323b01693..d2a38f24a 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RotatingTextAnchorPositionActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RotatingTextAnchorPositionActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RuntimeStylingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RuntimeStylingActivity.java
index 78bb451b9..6b2765bfa 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RuntimeStylingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/RuntimeStylingActivity.java
@@ -2,8 +2,6 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
@@ -15,10 +13,13 @@
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Change various properties of a map based on user interaction and other runtime situations.
  */
-public class RuntimeStylingActivity extends AppCompatActivity  {
+public class RuntimeStylingActivity extends AppCompatActivity {
 
   private MapView mapView;
   private Layer waterLayer;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/SatelliteOpacityOnZoomActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/SatelliteOpacityOnZoomActivity.java
index c7856e942..dc1bc85d0 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/SatelliteOpacityOnZoomActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/SatelliteOpacityOnZoomActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ShowHideLayersActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ShowHideLayersActivity.java
index e9e71e7a8..6bf76bee9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ShowHideLayersActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ShowHideLayersActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldFormattingActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldFormattingActivity.java
index 5977fd06c..ea8145760 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldFormattingActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldFormattingActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldMultipleFormatsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldMultipleFormatsActivity.java
index 164738bf5..7165f4d4c 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldMultipleFormatsActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TextFieldMultipleFormatsActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TransparentBackgroundActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TransparentBackgroundActivity.java
index 0855e73e9..c4eaf87a9 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TransparentBackgroundActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/TransparentBackgroundActivity.java
@@ -4,9 +4,9 @@
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RawRes;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.RawRes;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.VideoView;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VariableLabelPlacementActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VariableLabelPlacementActivity.java
index 7da9fbb05..770e7e444 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VariableLabelPlacementActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VariableLabelPlacementActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VectorSourceActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VectorSourceActivity.java
index 0f581465f..1ca641ccc 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VectorSourceActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/VectorSourceActivity.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ZoomDependentFillColorActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ZoomDependentFillColorActivity.java
index 8d30e6e4d..eae2d5a22 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ZoomDependentFillColorActivity.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/ZoomDependentFillColorActivity.java
@@ -1,8 +1,8 @@
 package com.mapbox.mapboxandroiddemo.examples.styles;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxsdk.Mapbox;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/DemoAppHomeScreenAddressWidget.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/DemoAppHomeScreenAddressWidget.java
index efe98b9e7..cfa0518aa 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/DemoAppHomeScreenAddressWidget.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/DemoAppHomeScreenAddressWidget.java
@@ -6,7 +6,7 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.location.Location;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/ItemClickSupport.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/ItemClickSupport.java
index e03bb0736..05de673cf 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/ItemClickSupport.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/ItemClickSupport.java
@@ -1,9 +1,9 @@
 package com.mapbox.mapboxandroiddemo.utils;
 
-import static android.support.v7.widget.RecyclerView.OnChildAttachStateChangeListener;
-import static android.support.v7.widget.RecyclerView.ViewHolder;
+import static androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener;
+import static androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/SettingsDialogView.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/SettingsDialogView.java
index 1a886a603..7bea9a02b 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/SettingsDialogView.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/SettingsDialogView.java
@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.widget.Switch;
 import android.widget.Toast;
diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/TileLoadingInterceptor.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/TileLoadingInterceptor.java
index 656f9fd01..2228a498d 100644
--- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/TileLoadingInterceptor.java
+++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/TileLoadingInterceptor.java
@@ -7,7 +7,7 @@
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.WindowManager;
diff --git a/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml b/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml
index 24a110bef..3a613f1bf 100644
--- a/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml
+++ b/MapboxAndroidDemo/src/main/res/layout-land/content_main.xml
@@ -9,7 +9,7 @@
     tools:context=".MainActivity"
     tools:showIn="@layout/app_bar_main">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/details_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_animated_image_gif.xml b/MapboxAndroidDemo/src/main/res/layout/activity_animated_image_gif.xml
index 1c6151030..343b74482 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_animated_image_gif.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_animated_image_gif.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraTargetLng="-73.99155"
         mapbox:mapbox_cameraZoom="3.5"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_animated_pin_drop.xml b/MapboxAndroidDemo/src/main/res/layout/activity_animated_pin_drop.xml
index 9a6110d43..a3fc9ed17 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_animated_pin_drop.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_animated_pin_drop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -73,4 +73,4 @@
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml
index 5615c514f..42a0d7fab 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_plugin_symbol_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraZoom="12"
         />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml b/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml
index 474cb536c..3bca439f5 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml
@@ -16,7 +16,7 @@
         android:gravity="center_horizontal"
         android:text="@string/fragment_in_card_below"/>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -34,7 +34,7 @@
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_bathymetry.xml b/MapboxAndroidDemo/src/main/res/layout/activity_bathymetry.xml
index 74480f0c9..5e42b4184 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_bathymetry.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_bathymetry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraZoom="15.69"
         mapbox:mapbox_cameraZoomMin="14.9" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_calendar_content_provider.xml b/MapboxAndroidDemo/src/main/res/layout/activity_calendar_content_provider.xml
index 5bc2c068d..742b05319 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_calendar_content_provider.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_calendar_content_provider.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/calendar_rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_circle_radius_activity.xml b/MapboxAndroidDemo/src/main/res/layout/activity_circle_radius_activity.xml
index 7863b976e..d1d1ac6a2 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_circle_radius_activity.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_circle_radius_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
+
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -19,4 +20,4 @@
         mapbox:mapbox_cameraTargetLng="-77.0295"
         mapbox:mapbox_cameraZoom="15" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml
index fc12298f0..641323ee5 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_multiple_expression_integration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +8,7 @@
     tools:context="com.mapbox.mapboxandroiddemo.examples.dds.ExpressionIntegrationActivity"
     android:orientation="vertical">
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/change_units_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
         mapbox:mapbox_cameraTargetLng="-100"
         mapbox:mapbox_cameraZoom="6"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_rotating_text_anchor.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_rotating_text_anchor.xml
index 7ff9c51a7..f9914a7e4 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_rotating_text_anchor.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_style_rotating_text_anchor.xml
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraZoomMax="5.38"
         mapbox:mapbox_cameraZoomMin="3.4" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center"
@@ -28,9 +28,9 @@
             android:layout_height="wrap_content"
             android:padding="8dp" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/switch_anchor_position_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_symbol_collision.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_symbol_collision.xml
index f421aa9f3..246f45052 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_symbol_collision.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_symbol_collision.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraTargetLng="16.156205"
         mapbox:mapbox_cameraZoom="2.494647" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardView4"
         android:layout_width="match_parent"
         android:layout_height="70dp"
@@ -26,7 +26,7 @@
         mapbox:layout_constraintEnd_toEndOf="parent"
         mapbox:layout_constraintStart_toStartOf="parent">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -54,11 +54,11 @@
                 mapbox:layout_constraintStart_toStartOf="@+id/textView3"
                 mapbox:layout_constraintTop_toBottomOf="@+id/textView3" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardView5"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
         mapbox:layout_constraintEnd_toEndOf="parent"
         mapbox:layout_constraintStart_toStartOf="parent">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -95,11 +95,11 @@
                 mapbox:layout_constraintStart_toStartOf="@+id/textView4"
                 mapbox:layout_constraintTop_toBottomOf="@+id/textView4" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardView6"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
         mapbox:layout_constraintEnd_toEndOf="@+id/mapView"
         mapbox:layout_constraintStart_toStartOf="@+id/mapView">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -139,11 +139,11 @@
                 mapbox:layout_constraintStart_toStartOf="@+id/textView5"
                 mapbox:layout_constraintTop_toBottomOf="@+id/textView5" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="395dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -155,7 +155,7 @@
         mapbox:layout_constraintEnd_toEndOf="@+id/mapView"
         mapbox:layout_constraintStart_toStartOf="@+id/mapView">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -179,9 +179,9 @@
                 mapbox:layout_constraintStart_toStartOf="@+id/textView6"
                 mapbox:layout_constraintTop_toBottomOf="@+id/textView6" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_dds_text_field_formatting.xml b/MapboxAndroidDemo/src/main/res/layout/activity_dds_text_field_formatting.xml
index aba84e8ea..8e9fca55c 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_dds_text_field_formatting.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_dds_text_field_formatting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -53,4 +53,4 @@
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_extrusion_light.xml b/MapboxAndroidDemo/src/main/res/layout/activity_extrusion_light.xml
index 2b3b48956..7f75664df 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_extrusion_light.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_extrusion_light.xml
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraZoom="16"
         />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabLightPosition"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
         mapbox:backgroundTint="@color/mapboxPink"
         mapbox:layout_anchorGravity="top"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabLightColor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_homescreen_geocoding_widget.xml b/MapboxAndroidDemo/src/main/res/layout/activity_homescreen_geocoding_widget.xml
index 374707ad7..e405a9881 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_homescreen_geocoding_widget.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_homescreen_geocoding_widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_image_source.xml b/MapboxAndroidDemo/src/main/res/layout/activity_image_source.xml
index 91976f2a6..508f1d0d4 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_image_source.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_image_source.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraTargetLng="-80.1263"
         mapbox:mapbox_cameraZoom="12" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_image_source_time_lapse.xml b/MapboxAndroidDemo/src/main/res/layout/activity_image_source_time_lapse.xml
index 2952d9a8d..280dd1a75 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_image_source_time_lapse.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_image_source_time_lapse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraTargetLng="-76.476"
         mapbox:mapbox_cameraZoom="4.3"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_info_window_symbol_layer.xml b/MapboxAndroidDemo/src/main/res/layout/activity_info_window_symbol_layer.xml
index 82662d650..254fc78e7 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_info_window_symbol_layer.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_info_window_symbol_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -13,4 +13,4 @@
         mapbox:mapbox_cameraZoom="3.853171"
         />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_inset_map.xml b/MapboxAndroidDemo/src/main/res/layout/activity_inset_map.xml
index da4b8c72f..a995e0d18 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_inset_map.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_inset_map.xml
@@ -17,7 +17,7 @@
         mapbox:mapbox_cameraZoomMin="3"
         maps:mapbox_enableZMediaOverlay="true" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardview"
         android:layout_width="150dp"
         android:layout_height="150dp"
@@ -33,6 +33,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_geocoding.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_geocoding.xml
index fe191fdad..92ba3f8b5 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_geocoding.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_geocoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,7 +14,7 @@
         mapbox:mapbox_cameraTargetLng="-77.0427"
         mapbox:mapbox_cameraZoom="11" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
@@ -27,7 +27,7 @@
             android:background="#fff"
             android:orientation="vertical">
 
-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingBottom="8dp">
@@ -122,12 +122,12 @@
                         mapbox:layout_constraintTop_toTopOf="@+id/geocode_latitude_editText" />
 
                 </ScrollView>
-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </LinearLayout>
 
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone.xml
index 19d5a7950..80abccfdc 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone.xml
@@ -16,7 +16,7 @@
         mapbox:mapbox_cameraZoom="8" />
 
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/toggle_isochrone_time_label_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
         app:srcCompat="@drawable/ic_text_icon_24dp"
         mapbox:fabSize="normal" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/switch_isochrone_style_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone_with_seekbar.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone_with_seekbar.xml
index b83d309d7..de8438361 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone_with_seekbar.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_isochrone_with_seekbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -19,7 +19,7 @@
         mapbox:mapbox_cameraTargetLng="16.374893"
         mapbox:mapbox_cameraZoom="8" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline9"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -64,4 +64,4 @@
         app:layout_constraintStart_toStartOf="@+id/want_to_live_within_textview"
         app:layout_constraintTop_toBottomOf="@+id/minutes_textview" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_static_image.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_static_image.xml
index d826b2216..893516422 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_static_image.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_static_image.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -82,7 +82,7 @@
         app:layout_constraintTop_toTopOf="@+id/guideline"
         tools:src="@drawable/miami_beach" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -90,4 +90,4 @@
         app:layout_constraintGuide_begin="282dp"
         app:layout_constraintGuide_percent=".55" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_tilequery.xml b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_tilequery.xml
index ec3de4850..7f57b4fb9 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_tilequery.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_javaservices_tilequery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraint_layout"
@@ -21,7 +21,7 @@
         mapbox:mapbox_cameraZoom="11"
         />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginBottom="8dp"
@@ -57,9 +57,9 @@
 
         </ScrollView>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline8"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -67,4 +67,4 @@
         mapbox:layout_constraintGuide_percent="0.7" />
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_indoor_map.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_indoor_map.xml
index db41b9233..a9632de14 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_indoor_map.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_indoor_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -40,4 +40,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_pulsing_layer_opacity_color.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_pulsing_layer_opacity_color.xml
index de3b7d99d..e54ca74c2 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_pulsing_layer_opacity_color.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_pulsing_layer_opacity_color.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -55,4 +55,4 @@
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_directions.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_directions.xml
index 04fab63fc..7f539ce2d 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_directions.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_directions.xml
@@ -12,7 +12,7 @@
         mapbox:mapbox_cameraTargetLng="100.501723"
         mapbox:mapbox_cameraZoom="10.58" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_on_map.xml b/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_on_map.xml
index 6c394c5e0..240a6505e 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_on_map.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_lab_recycler_view_on_map.xml
@@ -12,7 +12,7 @@
         mapbox:mapbox_cameraTargetLng="-58.374867"
         mapbox:mapbox_cameraZoom="12" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_landing.xml b/MapboxAndroidDemo/src/main/res/layout/activity_landing.xml
index 95870fb7e..3aef42125 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_landing.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_landing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
@@ -94,7 +94,7 @@
 
 
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -103,7 +103,7 @@
         tools:layout_editor_absoluteX="192dp"
         tools:layout_editor_absoluteY="0dp"/>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardView3"
         android:layout_width="0dp"
         android:layout_height="267dp"
@@ -126,9 +126,9 @@
             tools:layout_editor_absoluteX="8dp"
             tools:layout_editor_absoluteY="197dp"/>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/cardView2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -163,6 +163,6 @@
             tools:layout_editor_absoluteX="8dp"
             tools:layout_editor_absoluteY="64dp"/>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_line_gradient.xml b/MapboxAndroidDemo/src/main/res/layout/activity_line_gradient.xml
index e461f6fc3..7e70a1843 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_line_gradient.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_line_gradient.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         mapbox:mapbox_cameraTargetLng="-77.035"
         mapbox:mapbox_cameraZoom="12" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_loading.xml b/MapboxAndroidDemo/src/main/res/layout/activity_loading.xml
index 887a5a167..d0247e7b4 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_loading.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_loading.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                              xmlns:custom="http://schemas.android.com/apk/res-auto"
                                              xmlns:mapbox="http://schemas.android.com/apk/res-auto"
                                              xmlns:tools="http://schemas.android.com/tools"
@@ -37,18 +37,18 @@
         custom:layout_constraintLeft_toLeftOf="parent"
         custom:layout_constraintRight_toRightOf="parent"/>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         custom:layout_constraintGuide_percent="0.7"/>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         custom:layout_constraintGuide_percent="0.5"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_localization_plugin.xml b/MapboxAndroidDemo/src/main/res/layout/activity_localization_plugin.xml
index d539288a8..188ac6ede 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_localization_plugin.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_localization_plugin.xml
@@ -13,11 +13,11 @@
         app:mapbox_cameraTargetLng="136.711369"
         app:mapbox_cameraZoom="4.5257" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_one_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,9 +35,9 @@
                 android:text="@string/arabic"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_two_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -54,10 +54,10 @@
                 android:text="@string/russian"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/language_three_cardview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,11 +74,11 @@
                 android:text="@string/chinese"
                 android:textColor="@color/mapboxWhite" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/match_map_to_device_language"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_location_change_listening.xml b/MapboxAndroidDemo/src/main/res/layout/activity_location_change_listening.xml
index 088efe1fd..124320a05 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_location_change_listening.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_location_change_listening.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -17,4 +17,4 @@
         mapbox:mapbox_cameraTargetLng="-86.78160"
         mapbox:mapbox_cameraZoom="12" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_location_component_camera_options.xml b/MapboxAndroidDemo/src/main/res/layout/activity_location_component_camera_options.xml
index 4976d52a4..0f09a1ab2 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_location_component_camera_options.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_location_component_camera_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -76,4 +76,4 @@
 
     </LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_location_component_options.xml b/MapboxAndroidDemo/src/main/res/layout/activity_location_component_options.xml
index 7da33f886..9ace5024d 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_location_component_options.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_location_component_options.xml
@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         mapbox:mapbox_cameraZoom="15" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/back_to_camera_tracking_mode"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_magic_window.xml b/MapboxAndroidDemo/src/main/res/layout/activity_magic_window.xml
index e0984c92e..780e74581 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_magic_window.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_magic_window.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/parentView"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -47,4 +47,4 @@
     </com.mapbox.mapboxandroiddemo.examples.labs.MaskedView>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_main.xml b/MapboxAndroidDemo/src/main/res/layout/activity_main.xml
index 3c40766c2..b9162715e 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_main.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -23,4 +23,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/menu_activity_drawer"/>
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_marathon_extrusion.xml b/MapboxAndroidDemo/src/main/res/layout/activity_marathon_extrusion.xml
index 40e03accc..85a71de12 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_marathon_extrusion.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_marathon_extrusion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -28,4 +28,4 @@
         mapbox:mapbox_cameraZoom="12.692151"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_matrix_api.xml b/MapboxAndroidDemo/src/main/res/layout/activity_matrix_api.xml
index f310b0244..40a745834 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_matrix_api.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_matrix_api.xml
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraZoom="11.193"
         />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/matrix_api_recyclerview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_multiple_heatmap_styling.xml b/MapboxAndroidDemo/src/main/res/layout/activity_multiple_heatmap_styling.xml
index 99dbec46f..42d730b6d 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_multiple_heatmap_styling.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_multiple_heatmap_styling.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/switch_heatmap_style_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_picture_in_picture.xml b/MapboxAndroidDemo/src/main/res/layout/activity_picture_in_picture.xml
index 1b4cd56fd..e39a68226 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_picture_in_picture.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_picture_in_picture.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                              xmlns:mapbox="http://schemas.android.com/apk/res-auto"
                                              xmlns:tools="http://schemas.android.com/tools"
                                              android:layout_width="match_parent"
                                              android:layout_height="match_parent"
                                              android:orientation="vertical">
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_window_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,4 +30,4 @@
         tools:layout_editor_absoluteY="8dp"/>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_places_plugin.xml b/MapboxAndroidDemo/src/main/res/layout/activity_places_plugin.xml
index de1502d5c..693b85dd1 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_places_plugin.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_places_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraZoom="0.346515"
          />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_location_search"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,4 +23,4 @@
         app:backgroundTint="@color/colorPrimary"
         app:srcCompat="@android:drawable/ic_search_category_default" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_polygon_holes.xml b/MapboxAndroidDemo/src/main/res/layout/activity_polygon_holes.xml
index b9ab47d9e..8c34a4924 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_polygon_holes.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_polygon_holes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,4 +7,4 @@
     android:layout_height="match_parent"
     tools:context="com.mapbox.mapboxandroiddemo.examples.dds.PolygonHolesActivity">
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_population_density_extrusion.xml b/MapboxAndroidDemo/src/main/res/layout/activity_population_density_extrusion.xml
index fbedc4ce4..150dafdbc 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_population_density_extrusion.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_population_density_extrusion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -27,18 +27,18 @@
         >
     </com.mapbox.mapboxsdk.maps.MapView>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_begin="20dp"/>
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_begin="20dp"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_query_feature_count.xml b/MapboxAndroidDemo/src/main/res/layout/activity_query_feature_count.xml
index 81344ddb0..ad7b79afa 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_query_feature_count.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_query_feature_count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -30,4 +30,4 @@
 
     </RelativeLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_rv_symbol_layer.xml b/MapboxAndroidDemo/src/main/res/layout/activity_rv_symbol_layer.xml
index e17053d23..17253eae8 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_rv_symbol_layer.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_rv_symbol_layer.xml
@@ -12,7 +12,7 @@
         mapbox:mapbox_cameraTargetLng="-122.439004"
         mapbox:mapbox_cameraZoom="10"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_satellite_land_select.xml b/MapboxAndroidDemo/src/main/res/layout/activity_satellite_land_select.xml
index ccce253d3..c7115cad5 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_satellite_land_select.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_satellite_land_select.xml
@@ -27,7 +27,7 @@
         android:textAllCaps="false"
         android:textColor="@color/mapboxWhite" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/drop_pin_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_scalebar_plugin.xml b/MapboxAndroidDemo/src/main/res/layout/activity_scalebar_plugin.xml
index d8162e220..d5e46498a 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_scalebar_plugin.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_scalebar_plugin.xml
@@ -13,7 +13,7 @@
         mapbox:mapbox_cameraTargetLng="58.545909"
         mapbox:mapbox_cameraZoom="13.674097" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/switch_scalebar_style_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_snapshot_share.xml b/MapboxAndroidDemo/src/main/res/layout/activity_snapshot_share.xml
index 37f34b5dc..e8cca5c40 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_snapshot_share.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_snapshot_share.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraZoom="9"
          />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/camera_share_snapshot_image_fab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,4 +23,4 @@
         android:layout_margin="16dp"
         fab:fab_size="normal" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_local_style_source.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_local_style_source.xml
index 31a1f9b12..f0c418ca3 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_style_local_style_source.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_style_local_style_source.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -52,4 +52,4 @@
         mapbox:layout_constraintEnd_toEndOf="@+id/load_custom_raster_button"/>
 
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_rainfall.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_rainfall.xml
index 7f21b0fa4..9e916b9db 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_style_rainfall.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_style_rainfall.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,4 +17,4 @@
         app:mapbox_uiAttribution="false"
         app:mapbox_uiLogo="false"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_show_hide_layers.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_show_hide_layers.xml
index 64dc7ed1f..9e54e62e3 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_style_show_hide_layers.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_style_show_hide_layers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraTargetLng="-71.97722138410576"
         mapbox:mapbox_cameraZoom="15"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_layer_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -24,4 +24,4 @@
         android:src="@drawable/ic_layers_24dp"
         tools:backgroundTint="@color/colorAccent"/>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_transparent_render_background.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_transparent_render_background.xml
index 17805bc2f..1c7075b30 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_style_transparent_render_background.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_style_transparent_render_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
@@ -24,5 +24,5 @@
         app:mapbox_renderTextureMode="true"
         app:mapbox_renderTextureTranslucentSurface="true" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_styles_runtime_styling.xml b/MapboxAndroidDemo/src/main/res/layout/activity_styles_runtime_styling.xml
index b9d476293..389962ffb 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_styles_runtime_styling.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_styles_runtime_styling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -16,7 +16,7 @@
         mapbox:mapbox_cameraTargetLng="-84.654463"
         mapbox:mapbox_cameraZoom="3.371717" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -27,4 +27,4 @@
         mapbox:layout_constraintBottom_toBottomOf="parent"
         mapbox:layout_constraintEnd_toEndOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_symbol_layer_mapillary.xml b/MapboxAndroidDemo/src/main/res/layout/activity_symbol_layer_mapillary.xml
index fd8b3bb17..26b22d98b 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_symbol_layer_mapillary.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_symbol_layer_mapillary.xml
@@ -15,7 +15,7 @@
         mapbox:mapbox_cameraZoom="11"
          />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_on_top_of_map"
         android:layout_width="match_parent"
         android:layout_height="178dp"
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_traffic_plugin.xml b/MapboxAndroidDemo/src/main/res/layout/activity_traffic_plugin.xml
index 091265ae4..7edeec07e 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_traffic_plugin.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_traffic_plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -23,7 +23,7 @@
         mapbox:mapbox_cameraTargetLng="103.842874"
         mapbox:mapbox_cameraZoom="9.579712" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/traffic_toggle_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,4 +35,4 @@
         mapbox:layout_constraintBottom_toBottomOf="parent"
         mapbox:layout_constraintRight_toRightOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_user_location_map_frag.xml b/MapboxAndroidDemo/src/main/res/layout/activity_user_location_map_frag.xml
index f6e4ae8a2..06867d04a 100644
--- a/MapboxAndroidDemo/src/main/res/layout/activity_user_location_map_frag.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/activity_user_location_map_frag.xml
@@ -16,7 +16,7 @@
         android:gravity="center_horizontal"
         android:text="@string/location_component_fragment_text"/>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/location_frag_cardview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -31,5 +31,5 @@
             android:id="@+id/location_frag_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </RelativeLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/app_bar_main.xml b/MapboxAndroidDemo/src/main/res/layout/app_bar_main.xml
index 181b14a48..c5856cb81 100644
--- a/MapboxAndroidDemo/src/main/res/layout/app_bar_main.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/app_bar_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,20 +7,20 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/MapboxAndroidDemo/src/main/res/layout/calendar_rv_card.xml b/MapboxAndroidDemo/src/main/res/layout/calendar_rv_card.xml
index 93a126229..4c00f60b1 100644
--- a/MapboxAndroidDemo/src/main/res/layout/calendar_rv_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/calendar_rv_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300dp"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
@@ -26,4 +26,4 @@
             tools:text="Summer BBQ"
             android:textSize="20sp"/>
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/cardview_symbol_layer.xml b/MapboxAndroidDemo/src/main/res/layout/cardview_symbol_layer.xml
index db8167615..3da29cc32 100644
--- a/MapboxAndroidDemo/src/main/res/layout/cardview_symbol_layer.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/cardview_symbol_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/single_location_cardview"
@@ -70,4 +70,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/content_main.xml b/MapboxAndroidDemo/src/main/res/layout/content_main.xml
index 9988d1b7f..2b1b77411 100644
--- a/MapboxAndroidDemo/src/main/res/layout/content_main.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/content_main.xml
@@ -9,7 +9,7 @@
     tools:context=".MainActivity"
     tools:showIn="@layout/app_bar_main">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/details_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/MapboxAndroidDemo/src/main/res/layout/item.xml b/MapboxAndroidDemo/src/main/res/layout/item.xml
index 65ff64a47..2264948f8 100644
--- a/MapboxAndroidDemo/src/main/res/layout/item.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -67,4 +67,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/layout_description_item.xml b/MapboxAndroidDemo/src/main/res/layout/layout_description_item.xml
index 5313c808f..92cb452c9 100644
--- a/MapboxAndroidDemo/src/main/res/layout/layout_description_item.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/layout_description_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -32,4 +32,4 @@
                 android:textColor="@color/mapboxWhite"/>
         </LinearLayout>
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/layout_javaservices_description_card.xml b/MapboxAndroidDemo/src/main/res/layout/layout_javaservices_description_card.xml
index 226848f8e..1706f34ac 100644
--- a/MapboxAndroidDemo/src/main/res/layout/layout_javaservices_description_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/layout_javaservices_description_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -35,4 +35,4 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/layout_query_description_card.xml b/MapboxAndroidDemo/src/main/res/layout/layout_query_description_card.xml
index aafc20bdd..dcdaf2c8b 100644
--- a/MapboxAndroidDemo/src/main/res/layout/layout_query_description_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/layout_query_description_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -35,4 +35,4 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/marker_view_bubble.xml b/MapboxAndroidDemo/src/main/res/layout/marker_view_bubble.xml
index 56b36a898..d0c110466 100644
--- a/MapboxAndroidDemo/src/main/res/layout/marker_view_bubble.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/marker_view_bubble.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="200dp"
     xmlns:tools="http://schemas.android.com/tools"
@@ -30,4 +30,4 @@
         android:textColor="@color/black_semi_transparent"
         android:layout_height="wrap_content" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/rv_directions_card.xml b/MapboxAndroidDemo/src/main/res/layout/rv_directions_card.xml
index 4a78a6a8c..2e360a697 100644
--- a/MapboxAndroidDemo/src/main/res/layout/rv_directions_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/rv_directions_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300dp"
     android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/rv_matrix_card.xml b/MapboxAndroidDemo/src/main/res/layout/rv_matrix_card.xml
index f1a35ceed..33d74311e 100644
--- a/MapboxAndroidDemo/src/main/res/layout/rv_matrix_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/rv_matrix_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/single_matrix_api_location_cardview"
@@ -40,4 +40,4 @@
             tools:text="12"/>
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidDemo/src/main/res/layout/rv_on_top_of_map_card.xml b/MapboxAndroidDemo/src/main/res/layout/rv_on_top_of_map_card.xml
index c98f82a8f..15d96e152 100644
--- a/MapboxAndroidDemo/src/main/res/layout/rv_on_top_of_map_card.xml
+++ b/MapboxAndroidDemo/src/main/res/layout/rv_on_top_of_map_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300dp"
     android:layout_height="wrap_content"
@@ -36,4 +36,4 @@
     </LinearLayout>
 
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle
index 0c549a7be..d741d32ad 100644
--- a/MapboxAndroidWearDemo/build.gradle
+++ b/MapboxAndroidWearDemo/build.gradle
@@ -53,7 +53,6 @@ dependencies {
     api(dependenciesList.mapboxMapSdk)
 
     // Firebase
-    implementation dependenciesList.firebaseCrash
     implementation dependenciesList.firebasePerf
     implementation project(':SharedCode')
 }
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java
index ec50b3252..a728f45d1 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java
@@ -7,7 +7,6 @@
 
 import com.google.firebase.perf.metrics.AddTrace;
 import com.mapbox.mapboxandroiddemo.adapter.ExampleAdapter;
-
 import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
 import com.mapbox.mapboxandroiddemo.commons.FirstTimeRunChecker;
 import com.mapbox.mapboxandroiddemo.examples.LocationTrackingActivity;
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
index bb5d27ae5..34e82d39b 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/adapter/ExampleAdapter.java
@@ -1,8 +1,6 @@
 package com.mapbox.mapboxandroiddemo.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.wearable.view.WearableRecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +12,9 @@
 
 import java.util.ArrayList;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.wear.widget.WearableRecyclerView;
+
 public class ExampleAdapter extends WearableRecyclerView.Adapter<ExampleAdapter.ViewHolder> {
 
   private ArrayList<ExampleItemModel> data;
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/LocationTrackingActivity.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/LocationTrackingActivity.java
index 641f23732..debf4803d 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/LocationTrackingActivity.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/LocationTrackingActivity.java
@@ -3,7 +3,7 @@
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.support.wearable.activity.WearableActivity;
 import android.widget.Toast;
 
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/MapFragmentActivity.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/MapFragmentActivity.java
index 33f02ef4a..2334f4df1 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/MapFragmentActivity.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/MapFragmentActivity.java
@@ -2,7 +2,7 @@
 
 import android.app.FragmentTransaction;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.support.wearable.activity.WearableActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
@@ -39,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
       LatLng patagonia = new LatLng(-52.6885, -70.1395);
 
       // Build mapboxMap
-      MapboxMapOptions options = new MapboxMapOptions();
+      MapboxMapOptions options = MapboxMapOptions.createFromAttributes(this, null);
       options.camera(new CameraPosition.Builder()
         .target(patagonia)
         .zoom(9)
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java
index d5f246a92..917d66790 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java
@@ -3,7 +3,7 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.support.wearable.activity.WearableActivity;
 import android.util.Log;
 import android.view.View;
diff --git a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java
index 9716ed2a0..4d5a68d3d 100644
--- a/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java
+++ b/MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java
@@ -1,7 +1,7 @@
 package com.mapbox.mapboxandroiddemo.examples;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.support.wearable.activity.WearableActivity;
 
 import com.mapbox.mapboxandroiddemo.R;
diff --git a/SharedCode/src/main/java/com/mapbox/mapboxandroiddemo/commons/AnalyticsTracker.java b/SharedCode/src/main/java/com/mapbox/mapboxandroiddemo/commons/AnalyticsTracker.java
index 4e12ba1c5..993478ecd 100644
--- a/SharedCode/src/main/java/com/mapbox/mapboxandroiddemo/commons/AnalyticsTracker.java
+++ b/SharedCode/src/main/java/com/mapbox/mapboxandroiddemo/commons/AnalyticsTracker.java
@@ -4,7 +4,7 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.segment.analytics.Analytics;
 import com.segment.analytics.messages.IdentifyMessage;
diff --git a/build.gradle b/build.gradle
index 5f4701372..b586b2775 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,15 +7,17 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://maven.fabric.io/public' }
     }
 
     dependencies {
         classpath pluginDependencies.gradle
-        classpath pluginDependencies.firebase
+        classpath pluginDependencies.firebasePerformance
         classpath pluginDependencies.playPublisher
         classpath pluginDependencies.kotlin
+        classpath pluginDependencies.fabric
+        classpath pluginDependencies.googleServices
     }
-
 }
 
 plugins {
@@ -25,9 +27,9 @@ plugins {
 allprojects {
     repositories {
         google()
+        jcenter()
         maven { url "https://jitpack.io" }
         maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' }
     }
 }
@@ -39,4 +41,5 @@ task clean(type: Delete) {
 subprojects {
     // apply plugin: 'idea'
     apply from: "${rootDir}/gradle/dependencies.gradle"
-}
\ No newline at end of file
+}
+
diff --git a/circle.yml b/circle.yml
index d79186eda..6968e9ddf 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,6 +33,12 @@ jobs:
       - run:
           name: Clean gradle
           command: ./gradlew clean
+      - run:
+          name: Add preferences to gradle.properties file
+          command: |
+            echo "android.useAndroidX=true" >> gradle.properties
+            echo "android.enableJetifier=true" >> gradle.properties
+            echo "org.gradle.jvmargs=-Xmx4608M" >> gradle.properties
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies
@@ -40,6 +46,19 @@ jobs:
           paths:
             - ~/.gradle
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "MapboxAndroidDemo/build.gradle" }}
+      - run:
+          name: Create google-services.json file
+          shell: /bin/bash -euo pipefail
+          command: |
+            if [ -n "${GOOGLE_SERVICES_JSON_RELEASE}" ]; then
+              echo "${GOOGLE_SERVICES_JSON_RELEASE}" > MapboxAndroidDemo/google-services.json
+            fi
+      - run:
+          name: Add preferences to fabric.properties file
+          command: |
+            if [ -n "${FABRIC_PROPERTIES_CONFIG_FILE}" ]; then
+              echo "${FABRIC_PROPERTIES_CONFIG_FILE}" > MapboxAndroidDemo/fabric.properties
+            fi
       - run:
           name: Log in to Google Cloud Platform
           shell: /bin/bash -euo pipefail
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 8236ac41f..140758ef6 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,6 +1,6 @@
 ext {
     androidVersions = [
-            minSdkVersion    : 15,
+            minSdkVersion    : 16,
             minWearSdkVersion: 23,
             targetSdkVersion : 28,
             compileSdkVersion: 28,
@@ -24,9 +24,14 @@ ext {
             mapboxPluginScalebar     : '0.1.0',
 
             // Support
-            supportLib               : '28.0.0',
-            constraintLayout         : '1.1.3',
-            firebase                 : '11.0.4',
+            legacySupportV4          : '1.0.0',
+            androidXLib              : '1.0.0',
+            androidXAnnotation       : '1.1.0',
+            androidXMaterialDesign   : '1.1.0-alpha07',
+            androidXConstraintLayout : '1.1.3',
+            firebaseCore             : '17.0.0',
+            firebasePerf             : '18.0.1',
+            firebaseCrashlytics      : '2.10.1',
 
             // Square
             leakCanary               : '1.5.4',
@@ -41,28 +46,30 @@ ext {
             materialStyleDialog      : '2.1',
             baseFab                  : '1.10.1',
             materialDialogsCommons   : '0.9.6.0',
-            espresso                 : '3.0.2',
-            testRunner               : '1.0.2',
-            junit                    : '4.12',
+            espresso                 : '3.1.0',
+            testRunner               : '1.1.0',
+            junit                    : '1.0.0',
             supportAnnotations       : '27.1.1',
             kotlin                   : '1.2.70',
-            multiDex                 : '1.0.3'
+            multiDex                 : '2.0.0'
     ]
 
     wearVersion = [
             googleWearable   : '2.0.4',
-            googlePlayService: '11.0.4',
-            wearableUi       : '27.0.0',
+            googlePlayService: '17.0.0',
+            wearableUi       : '1.0.0',
     ]
 
     pluginVersion = [
-            checkstyle         : '8.2',
-            firebase           : '1.1.1',
-            gradle             : '3.2.1',
-            gradlePlayPublisher: '1.2.2',
-            kotlin             : '1.2.71',
-            dependencyGraph    : '0.3.0',
-            grgit              : '2.3.0'
+            checkstyle          : '8.2',
+            firebasePerformance : '1.2.1',
+            gradle              : '3.2.1',
+            gradlePlayPublisher : '1.2.2',
+            kotlin              : '1.2.71',
+            dependencyGraph     : '0.3.0',
+            grgit               : '2.3.0',
+            fabric              : '1.29.0',
+            googleServices      : '4.2.0',
     ]
 
     dependenciesList = [
@@ -82,16 +89,16 @@ ext {
             mapboxPluginScalebar     : "com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-${version.mapboxMapPrefix}:${version.mapboxPluginScalebar}",
 
             // Support
-            supportV4                : "com.android.support:support-v4:${version.supportLib}",
-            supportAppcompatV7       : "com.android.support:appcompat-v7:${version.supportLib}",
-            supportDesign            : "com.android.support:design:${version.supportLib}",
-            supportRecyclerView      : "com.android.support:recyclerview-v7:${version.supportLib}",
-            supportCardView          : "com.android.support:cardview-v7:${version.supportLib}",
-            supportGridLayout        : "com.android.support:gridlayout-v7:${version.supportLib}",
-            supportCustomTabs        : "com.android.support:customtabs:${version.supportLib}",
-            supportConstraintLayout  : "com.android.support.constraint:constraint-layout:${version.constraintLayout}",
-            supportAnnotations       : "com.android.support:support-annotations:${version.supportAnnotations}",
-            supportAnimation         : "com.android.support:support-dynamic-animation:${version.supportLib}",
+            supportAppcompatV4       : "androidx.legacy:legacy-support-v4:${version.legacySupportV4}",
+            supportAppcompatV7       : "androidx.appcompat:appcompat:${version.androidXLib}",
+            supportMaterialDesign    : "com.google.android.material:material:${version.androidXMaterialDesign}",
+            supportRecyclerView      : "androidx.recyclerview:recyclerview:${version.androidXLib}",
+            supportCardView          : "androidx.cardview:cardview:${version.androidXLib}",
+            supportGridLayout        : "androidx.gridlayout:gridlayout:${version.androidXLib}",
+            supportCustomTabs        : "androidx.browser:browser:${version.androidXLib}",
+            supportConstraintLayout  : "androidx.constraintlayout:constraintlayout:${version.androidXConstraintLayout}",
+            supportAnnotations       : "androidx.annotation:annotation:${version.androidXAnnotation}",
+            supportAnimation         : "androidx.dynamicanimation:dynamicanimation:${version.androidXLib}",
 
             // Square
             timber                   : "com.jakewharton.timber:timber:${version.timber}",
@@ -103,8 +110,9 @@ ext {
             leakCanaryRelease        : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}",
 
             // Firebase
-            firebaseCrash            : "com.google.firebase:firebase-crash:${version.firebase}",
-            firebasePerf             : "com.google.firebase:firebase-perf:${version.firebase}",
+            firebasePerf             : "com.google.firebase:firebase-perf:${version.firebasePerf}",
+            firebaseCore             : "com.google.firebase:firebase-core:${version.firebaseCore}",
+            firebaseCrashlytics      : "com.crashlytics.sdk.android:crashlytics:${version.firebaseCrashlytics}",
 
             // Other
             gson                     : "com.google.code.gson:gson:${version.gson}",
@@ -113,30 +121,32 @@ ext {
             baseFab                  : "com.getbase:floatingactionbutton:${version.baseFab}",
             materialDialogsCommons   : "com.afollestad.material-dialogs:commons:${version.materialDialogsCommons}",
             kotlin                   : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${version.kotlin}",
-            multiDex                 : "com.android.support:multidex:${version.multiDex}",
+            multiDex                 : "androidx.multidex:multidex:${version.multiDex}",
 
             // Testing
-            testEspressoCore         : "com.android.support.test.espresso:espresso-core:${version.espresso}",
-            testEspressoIntents      : "com.android.support.test.espresso:espresso-intents:${version.espresso}",
-            testEspressoContrib      : "com.android.support.test.espresso:espresso-contrib:${version.espresso}",
-            testRunner               : "com.android.support.test:runner:${version.testRunner}",
-            testRules                : "com.android.support.test:rules:${version.testRunner}",
-            junit                    : "junit:junit:${version.junit}",
+            testEspressoCore         : "androidx.test.espresso:espresso-core:${version.espresso}",
+            testEspressoIntents      : "androidx.test.espresso:espresso-intents:${version.espresso}",
+            testEspressoContrib      : "androidx.test.espresso:espresso-contrib:${version.espresso}",
+            testRunner               : "androidx.test:runner:${version.testRunner}",
+            testRules                : "androidx.test:rules:${version.testRunner}",
+            junit                    : "androidx.test.ext:junit:${version.junit}",
     ]
 
     pluginDependencies = [
-            gradle          : "com.android.tools.build:gradle:${pluginVersion.gradle}",
-            checkstyle      : "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}",
-            firebase        : "com.google.firebase:firebase-plugins:${pluginVersion.firebase}",
-            playPublisher   : "com.github.triplet.gradle:play-publisher:${pluginVersion.gradlePlayPublisher}",
-            kotlin          : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}",
-            dependencyGraph : "com.vanniktech:gradle-dependency-graph-generator-plugin:${pluginVersion.dependencyGraph}",
-            grgit           : "org.ajoberstar:grgit:${pluginVersion.grgit}"
+            gradle              : "com.android.tools.build:gradle:${pluginVersion.gradle}",
+            checkstyle          : "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}",
+            firebasePerformance : "com.google.firebase:perf-plugin:${pluginVersion.firebasePerformance}",
+            playPublisher       : "com.github.triplet.gradle:play-publisher:${pluginVersion.gradlePlayPublisher}",
+            kotlin              : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}",
+            dependencyGraph     : "com.vanniktech:gradle-dependency-graph-generator-plugin:${pluginVersion.dependencyGraph}",
+            grgit               : "org.ajoberstar:grgit:${pluginVersion.grgit}",
+            fabric              : "io.fabric.tools:gradle:${pluginVersion.fabric}",
+            googleServices      : "com.google.gms:google-services:${pluginVersion.googleServices}",
     ]
 
     wearDependencies = [
             googleWearable       : "com.google.android.wearable:wearable:${wearVersion.googleWearable}",
-            wearableUi           : "com.android.support:wear:${wearVersion.wearableUi}",
+            wearableUi           : "androidx.wear:wear:${wearVersion.wearableUi}",
             supportGoogleWearable: "com.google.android.support:wearable:${wearVersion.googleWearable}",
             gpsWearable          : "com.google.android.gms:play-services-wearable:${wearVersion.googlePlayService}",
             gpsLocation          : "com.google.android.gms:play-services-location:${wearVersion.googlePlayService}"