Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Cherry pick external vectorDrawable and offline PRs #13168

Merged
merged 3 commits into from
Oct 24, 2018
Merged

Cherry pick external vectorDrawable and offline PRs #13168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1286409
[android] Revert vectorDrawables.useSupportLibrary to false in order …
DonTomika Oct 21, 2018
e92c835
[android] Removed an unused import
DonTomika Oct 22, 2018
8e5e8e7
File deactivate should be called before callbacks
BharathMG Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion platform/android/MapboxGLAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
3 changes: 0 additions & 3 deletions ...oid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import android.support.annotation.Nullable;
import android.support.annotation.RequiresPermission;
import android.support.annotation.StyleRes;
import android.support.v7.app.AppCompatDelegate;
import android.view.WindowManager;

import com.mapbox.android.core.location.LocationEngine;
Expand Down Expand Up @@ -758,8 +757,6 @@ private void initialize(@NonNull Context context, @NonNull LocationComponentOpti
isInitialized = true;
this.options = options;

AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);

mapboxMap.addOnMapClickListener(onMapClickListener);
mapboxMap.addOnMapLongClickListener(onMapLongClickListener);

Expand Down
6 changes: 3 additions & 3 deletions .../android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ public void onStatus(final OfflineRegionStatus status) {
handler.post(new Runnable() {
@Override
public void run() {
callback.onStatus(status);
FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
callback.onStatus(status);
}
});
}
Expand All @@ -342,8 +342,8 @@ public void onError(final String error) {
handler.post(new Runnable() {
@Override
public void run() {
callback.onError(error);
FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
callback.onError(error);
}
});
}
Expand Down Expand Up @@ -377,8 +377,8 @@ public void onDelete() {
handler.post(new Runnable() {
@Override
public void run() {
callback.onDelete();
FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
callback.onDelete();
OfflineRegion.this.finalize();
}
});
Expand Down
2 changes: 1 addition & 1 deletion platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 0 additions & 3 deletions platform/android/MapboxGLAndroidSDKTestApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ android {
versionCode 13
versionName "6.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary true
}
}

compileOptions {
Expand Down