From abae2b215555ccd6dc3422f54527af6cdde79fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tama=CC=81s=20Szincsa=CC=81k?= <dontomika@gmail.com>
Date: Mon, 22 Oct 2018 00:53:32 +0200
Subject: [android] Revert vectorDrawables.useSupportLibrary to false in order
 to increase stability on Android 4.4 and below

---
 platform/android/MapboxGLAndroidSDK/build.gradle                       | 1 -
 .../src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java | 2 --
 .../src/main/res/drawable/mapbox_user_bearing_icon.xml                 | 2 +-
 .../MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml      | 2 +-
 .../src/main/res/drawable/mapbox_user_icon_stale.xml                   | 2 +-
 .../MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml | 2 +-
 platform/android/MapboxGLAndroidSDKTestApp/build.gradle                | 3 ---
 7 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index f91df8a8a4..f20326e3db 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -27,7 +27,6 @@ android {
     buildToolsVersion androidVersions.buildToolsVersion
 
     defaultConfig {
-        vectorDrawables.useSupportLibrary = true
         minSdkVersion androidVersions.minSdkVersion
         targetSdkVersion androidVersions.targetSdkVersion
         buildConfigField "String", "GIT_REVISION_SHORT", String.format("\"%s\"", getGitRevision())
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
index af48b5c4d4..efcfa5163c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
@@ -758,8 +758,6 @@ public final class LocationComponent {
     isInitialized = true;
     this.options = options;
 
-    AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-
     mapboxMap.addOnMapClickListener(onMapClickListener);
     mapboxMap.addOnMapLongClickListener(onMapLongClickListener);
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
index 51bb1161aa..8498b1c14e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
@@ -5,6 +5,6 @@
   android:viewportHeight="36.0"
   android:viewportWidth="36.0">
   <path
-    android:fillColor="@color/mapbox_location_layer_blue"
+    android:fillColor="#4A90E2"
     android:pathData="M18,0L23,7L13,7L18,0ZM22.8,7C21.33,6.36 19.71,6 18,6C16.29,6 14.67,6.36 13.2,7L22.8,7Z"/>
 </vector>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
index 42f7d35aa9..fd0deba75f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
@@ -5,6 +5,6 @@
   android:viewportHeight="14.0"
   android:viewportWidth="14.0">
   <path
-    android:fillColor="@color/mapbox_location_layer_blue"
+    android:fillColor="#4A90E2"
     android:pathData="M7,7m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"/>
 </vector>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
index ecfb85b2e8..fa337a25c2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
@@ -5,6 +5,6 @@
   android:viewportHeight="14.0"
   android:viewportWidth="14.0">
   <path
-    android:fillColor="@color/mapbox_location_layer_gray"
+    android:fillColor="#A1B0C0"
     android:pathData="M7,7m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"/>
 </vector>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
index 4f13268419..7ca9d32657 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
@@ -12,6 +12,6 @@
     android:fillColor="#FFFFFF"
     android:pathData="M37.5,37.5m-28.5,0a28.5,28.5 0,1 1,57 0a28.5,28.5 0,1 1,-57 0"/>
   <path
-    android:fillColor="@color/mapbox_location_layer_blue"
+    android:fillColor="#4A90E2"
     android:pathData="M39.2,28.46C39.01,27.99 38.54,27.68 38.02,27.69C37.5,27.7 37.02,28.01 36.81,28.49L27.05,45.83C26.83,46.32 26.92,46.89 27.28,47.26C27.65,47.64 28.21,47.75 28.71,47.54L37.07,44.03C37.39,43.89 37.75,43.89 38.06,44.02L46.27,47.34C46.75,47.54 47.33,47.42 47.71,47.03C48.09,46.64 48.21,46.07 48,45.59L39.2,28.46Z"/>
 </vector>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index dee713ffcb..5588db5fc9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -11,9 +11,6 @@ android {
         versionCode 13
         versionName "6.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
     }
 
     compileOptions {
-- 
cgit v1.2.1