From b630dbc35755e4ac71ec8d82749d311893522457 Mon Sep 17 00:00:00 2001
From: Fabian Guerra <fabian.guerra@mapbox.com>
Date: Fri, 16 Feb 2018 12:42:01 -0500
Subject: [PATCH] [android] Reverted master changes that doesn't apply to boba.

---
 platform/android/MapboxGLAndroidSDK/gradle.properties         | 2 +-
 .../java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java   | 4 ++--
 platform/android/scripts/exclude-activity-gen.json            | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index 3796173fd..f00eb1d77 100644
--- a/platform/android/MapboxGLAndroidSDK/gradle.properties
+++ b/platform/android/MapboxGLAndroidSDK/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.mapbox.mapboxsdk
-VERSION_NAME=7.0.0-SNAPSHOT
+VERSION_NAME=6.0.0-SNAPSHOT
 
 POM_DESCRIPTION=Mapbox GL Android SDK
 POM_URL=https://github.com/mapbox/mapbox-gl-native
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
index 67ecf072e..fb2c70cb7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
@@ -7,10 +7,10 @@ import android.support.annotation.NonNull;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPropertyAnimatorCompat;
 import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
-import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 
@@ -24,7 +24,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
  * </p>
  */
 @SuppressLint("AppCompatCustomView")
-public final class CompassView extends AppCompatImageView implements Runnable {
+public final class CompassView extends ImageView implements Runnable {
 
   public static final long TIME_WAIT_IDLE = 500;
   public static final long TIME_MAP_NORTH_ANIMATION = 150;
diff --git a/platform/android/scripts/exclude-activity-gen.json b/platform/android/scripts/exclude-activity-gen.json
index 1d61d9394..eff7fb9cb 100644
--- a/platform/android/scripts/exclude-activity-gen.json
+++ b/platform/android/scripts/exclude-activity-gen.json
@@ -27,7 +27,6 @@
   "QueryRenderedFeaturesBoxHighlightActivity",
   "MultiMapActivity",
   "MapInDialogActivity",
-  "SimpleMapActivity",
   "ManualZoomActivity",
   "MaxMinZoomActivity",
   "ScrollByActivity",