[android] - rename attributes (#6894)

4 files changed, 159 insertions, 139 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
index 11296b7875..6c5e76dc45 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java
@@ -154,12 +154,12 @@ public final class CameraPosition implements Parcelable {
         public Builder(TypedArray typedArray) {
             super();
             if (typedArray != null) {
-                this.bearing = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_direction, 0.0f);
-                double lat = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_latitude, 0.0f);
-                double lng = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_longitude, 0.0f);
+                this.bearing = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraBearing, 0.0f);
+                double lat = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLat, 0.0f);
+                double lng = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLng, 0.0f);
                 this.target = new LatLng(lat, lng);
-                this.tilt = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_tilt, 0.0f);
-                this.zoom = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom, 0.0f);
+                this.tilt = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTilt, 0.0f);
+                this.zoom = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoom, 0.0f);
             }
         }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 51af4c029e..c919952b4e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -172,74 +172,72 @@ public class MapboxMapOptions implements Parcelable {
         float screenDensity = context.getResources().getDisplayMetrics().density;
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.mapbox_MapView, 0, 0);
         try {
-            mapboxMapOptions.debugActive(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_debug_active, false));
-
             mapboxMapOptions.camera(new CameraPosition.Builder(typedArray).build());
 
-            mapboxMapOptions.accessToken(typedArray.getString(R.styleable.mapbox_MapView_mapbox_access_token));
-            mapboxMapOptions.styleUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_style_url));
-            mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_api_base_url));
-
-            mapboxMapOptions.zoomGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_zoom_enabled, true));
-            mapboxMapOptions.scrollGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_scroll_enabled, true));
-            mapboxMapOptions.rotateGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_rotate_enabled, true));
-            mapboxMapOptions.tiltGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_tilt_enabled, true));
-            mapboxMapOptions.zoomControlsEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_zoom_controls_enabled, false));
-
-            mapboxMapOptions.maxZoom(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom_max, MapboxConstants.MAXIMUM_ZOOM));
-            mapboxMapOptions.minZoom(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom_min, MapboxConstants.MINIMUM_ZOOM));
-
-            mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_compass_enabled, true));
-            mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_compass_gravity, Gravity.TOP | Gravity.END));
-            mapboxMapOptions.compassMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_compass_margin_left, DIMENSION_TEN_DP) * screenDensity)
-                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_compass_margin_top, DIMENSION_TEN_DP * screenDensity))
-                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_compass_margin_right, DIMENSION_TEN_DP * screenDensity))
-                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_compass_margin_bottom, DIMENSION_TEN_DP * screenDensity))});
-            mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_compass_fade_facing_north, true));
-
-            mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_logo_enabled, true));
-            mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_logo_gravity, Gravity.BOTTOM | Gravity.START));
-            mapboxMapOptions.logoMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_logo_margin_left, DIMENSION_SIXTEEN_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_logo_margin_top, DIMENSION_SIXTEEN_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_logo_margin_right, DIMENSION_SIXTEEN_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_logo_margin_bottom, DIMENSION_SIXTEEN_DP) * screenDensity)});
-
-            mapboxMapOptions.attributionTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_attribution_tint, -1));
-            mapboxMapOptions.attributionEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_attribution_enabled, true));
-            mapboxMapOptions.attributionGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_attribution_gravity, Gravity.BOTTOM));
-            mapboxMapOptions.attributionMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_attribution_margin_left, DIMENSION_SEVENTY_SIX_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_attribution_margin_top, DIMENSION_SEVEN_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_attribution_margin_right, DIMENSION_SEVEN_DP) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_attribution_margin_bottom, DIMENSION_SEVEN_DP) * screenDensity)});
-
-            mapboxMapOptions.locationEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_my_location_enabled, false));
-            mapboxMapOptions.myLocationForegroundTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_my_location_foreground_tint, Color.TRANSPARENT));
-            mapboxMapOptions.myLocationBackgroundTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_my_location_background_tint, Color.TRANSPARENT));
-
-            Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground);
+            mapboxMapOptions.accessToken(typedArray.getString(R.styleable.mapbox_MapView_mapbox_accessToken));
+            mapboxMapOptions.styleUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_styleUrl));
+            mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_apiBaseUrl));
+
+            mapboxMapOptions.zoomGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiZoomGestures, true));
+            mapboxMapOptions.scrollGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiScrollGestures, true));
+            mapboxMapOptions.rotateGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiRotateGestures, true));
+            mapboxMapOptions.tiltGesturesEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiTiltGestures, true));
+            mapboxMapOptions.zoomControlsEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiZoomControls, false));
+
+            mapboxMapOptions.maxZoom(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoomMax, MapboxConstants.MAXIMUM_ZOOM));
+            mapboxMapOptions.minZoom(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoomMin, MapboxConstants.MINIMUM_ZOOM));
+
+            mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiCompass, true));
+            mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiCompassGravity, Gravity.TOP | Gravity.END));
+            mapboxMapOptions.compassMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginLeft, DIMENSION_TEN_DP) * screenDensity)
+                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginTop, DIMENSION_TEN_DP * screenDensity))
+                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginRight, DIMENSION_TEN_DP * screenDensity))
+                    , ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginBottom, DIMENSION_TEN_DP * screenDensity))});
+            mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiCompassFadeFacingNorth, true));
+
+            mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiLogo, true));
+            mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiLogoGravity, Gravity.BOTTOM | Gravity.START));
+            mapboxMapOptions.logoMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginLeft, DIMENSION_SIXTEEN_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginTop, DIMENSION_SIXTEEN_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginRight, DIMENSION_SIXTEEN_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginBottom, DIMENSION_SIXTEEN_DP) * screenDensity)});
+
+            mapboxMapOptions.attributionTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_uiAttributionTintColor, -1));
+            mapboxMapOptions.attributionEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiAttribution, true));
+            mapboxMapOptions.attributionGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiAttributionGravity, Gravity.BOTTOM));
+            mapboxMapOptions.attributionMargins(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginLeft, DIMENSION_SEVENTY_SIX_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginTop, DIMENSION_SEVEN_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginRight, DIMENSION_SEVEN_DP) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginBottom, DIMENSION_SEVEN_DP) * screenDensity)});
+
+            mapboxMapOptions.locationEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_myLocation, false));
+            mapboxMapOptions.myLocationForegroundTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_myLocationTintColor, Color.TRANSPARENT));
+            mapboxMapOptions.myLocationBackgroundTintColor(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundTintColor, Color.TRANSPARENT));
+
+            Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_myLocationDrawable);
             if (foregroundDrawable == null) {
                 foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default);
             }
 
-            Drawable foregroundBearingDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground_bearing);
+            Drawable foregroundBearingDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_myLocationBearingDrawable);
             if (foregroundBearingDrawable == null) {
                 foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing);
             }
 
-            Drawable backgroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_background);
+            Drawable backgroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundDrawable);
             if (backgroundDrawable == null) {
                 backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape);
             }
 
             mapboxMapOptions.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable);
             mapboxMapOptions.myLocationBackgroundDrawable(backgroundDrawable);
-            mapboxMapOptions.myLocationBackgroundPadding(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_my_location_background_left, 0) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_my_location_background_top, 0) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_my_location_background_right, 0) * screenDensity)
-                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_my_location_background_bottom, 0) * screenDensity)});
-            mapboxMapOptions.myLocationAccuracyAlpha(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_my_location_accuracy_alpha, 100));
-            mapboxMapOptions.myLocationAccuracyTint(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_my_location_accuracy_tint, ColorUtils.getPrimaryColor(context)));
-            mapboxMapOptions.textureMode(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_texture_mode, false));
+            mapboxMapOptions.myLocationBackgroundPadding(new int[]{(int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundMarginLeft, 0) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundMarginTop, 0) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundMarginRight, 0) * screenDensity)
+                    , (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_myLocationBackgroundMarginBottom, 0) * screenDensity)});
+            mapboxMapOptions.myLocationAccuracyAlpha(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_myLocationAccuracyAlpha, 100));
+            mapboxMapOptions.myLocationAccuracyTint(typedArray.getColor(R.styleable.mapbox_MapView_mapbox_myLocationAccuracyTintColor, ColorUtils.getPrimaryColor(context)));
+            mapboxMapOptions.textureMode(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_renderTextureMode, false));
         } finally {
             typedArray.recycle();
         }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index 97f21a7b45..5b2945d55d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -7,6 +7,59 @@
 
     <public name="mapbox_AlertDialogStyle" type="style" />
 
+    <!-- Exposed attrs.xml -->
+    <public name="mapbox_accessToken" type="attr" />
+    <public name="mapbox_styleUrl" type="attr" />
+    <public name="mapbox_apiBaseUrl" type="attr" />
+
+    <public name="mapbox_cameraTargetLng" type="attr" />
+    <public name="mapbox_cameraTargetLat" type="attr" />
+    <public name="mapbox_cameraZoom_level" type="attr" />
+    <public name="mapbox_cameraBearing" type="attr" />
+
+    <public name="mapbox_uiZoomGestures" type="attr" />
+    <public name="mapbox_uiScrollGestures" type="attr" />
+    <public name="mapbox_uiRotateGestures" type="attr" />
+    <public name="mapbox_uiZoomControls" type="attr" />
+
+    <public name="mapbox_myLocation" type="attr" />
+    <public name="mapbox_myLocationTintColor" type="attr" />
+    <public name="mapbox_myLocationDrawable" type="attr" />
+    <public name="mapbox_myLocationBearingDrawable" type="attr" />
+    <public name="mapbox_myLocationBackgroundDrawable" type="attr" />
+    <public name="mapbox_myLocationBackgroundTintColor" type="attr" />
+    <public name="mapbox_myLocationBackgroundMarginLeft" type="attr" />
+    <public name="mapbox_myLocationBackgroundMarginTop" type="attr" />
+    <public name="mapbox_myLocationBackgroundMarginRight" type="attr" />
+    <public name="mapbox_myLocationBackgroundMarginBottom" type="attr" />
+    <public name="mapbox_myLocationAccuracyTintColor" type="attr" />
+    <public name="mapbox_myLocationAccuracyAlpha" type="attr" />
+
+    <public name="mapbox_uiCompass" type="attr" />
+    <public name="mapbox_uiCompassGravity" type="attr" />
+    <public name="mapbox_uiCompassMarginLeft" type="attr" />
+    <public name="mapbox_uiCompassMarginTop" type="attr" />
+    <public name="mapbox_uiCompassMarginRight" type="attr" />
+    <public name="mapbox_uiCompassMarginBottom" type="attr" />
+    <public name="mapbox_uiCompassFadeFacingNorth" type="attr" />
+
+    <public name="mapbox_uiLogo" type="attr" />
+    <public name="mapbox_uiLogoGravity" type="attr" />
+    <public name="mapbox_uiLogoMarginLeft" type="attr" />
+    <public name="mapbox_uiLogoMarginTop" type="attr" />
+    <public name="mapbox_uiLogoMarginRight" type="attr" />
+    <public name="mapbox_uiLogoMarginBottom" type="attr" />
+
+    <public name="mapbox_uiAttribution" type="attr" />
+    <public name="mapbox_uiAttributionGravity" type="attr" />
+    <public name="mapbox_uiAttributionMarginLeft" type="attr" />
+    <public name="mapbox_uiAttributionMarginTop" type="attr" />
+    <public name="mapbox_uiAttributionMarginRight" type="attr" />
+    <public name="mapbox_uiAttributionMarginBottom" type="attr" />
+
+    <public name="mapbox_renderTextureMode" type="attr" />
+
+    <!-- Exposed styles -->
     <public name="mapbox_style_mapbox_streets" type="string" />
     <public name="mapbox_style_emerald" type="string" />
     <public name="mapbox_style_light" type="string" />
@@ -14,39 +67,7 @@
     <public name="mapbox_style_satellite" type="string" />
     <public name="mapbox_style_satellite_streets" type="string" />
 
-    <public name="mapbox_center_longitude" type="attr" />
-    <public name="mapbox_center_latitude" type="attr" />
-    <public name="mapbox_zoom_level" type="attr" />
-    <public name="mapbox_direction" type="attr" />
-    <public name="mapbox_zoom_enabled" type="attr" />
-    <public name="mapbox_scroll_enabled" type="attr" />
-    <public name="mapbox_rotate_enabled" type="attr" />
-    <public name="mapbox_zoom_controls_enabled" type="attr" />
-    <public name="mapbox_debug_active" type="attr" />
-    <public name="mapbox_style_url" type="attr" />
-    <public name="mapbox_access_token" type="attr" />
-    <public name="mapbox_style_classes" type="attr" />
-    <public name="mapbox_my_location_enabled" type="attr" />
-    <public name="mapbox_compass_enabled" type="attr" />
-    <public name="mapbox_compass_gravity" type="attr" />
-    <public name="mapbox_compass_margin_left" type="attr" />
-    <public name="mapbox_compass_margin_top" type="attr" />
-    <public name="mapbox_compass_margin_right" type="attr" />
-    <public name="mapbox_compass_margin_bottom" type="attr" />
-    <public name="mapbox_compass_fade_facing_north" type="attr" />
-    <public name="mapbox_logo_gravity" type="attr" />
-    <public name="mapbox_logo_margin_left" type="attr" />
-    <public name="mapbox_logo_margin_top" type="attr" />
-    <public name="mapbox_logo_margin_right" type="attr" />
-    <public name="mapbox_logo_margin_bottom" type="attr" />
-    <public name="mapbox_logo_visibility" type="attr" />
-    <public name="mapbox_attribution_gravity" type="attr" />
-    <public name="mapbox_attribution_margin_left" type="attr" />
-    <public name="mapbox_attribution_margin_top" type="attr" />
-    <public name="mapbox_attribution_margin_right" type="attr" />
-    <public name="mapbox_attribution_margin_bottom" type="attr" />
-    <public name="mapbox_attribution_visibility" type="attr" />
-
+    <!-- Exposed drawables -->
     <public name="mapbox_logo_icon" type="drawable" />
     <public name="mapbox_compass_icon" type="drawable" />
     <public name="mapbox_marker_icon_default" type="drawable" />
@@ -56,6 +77,7 @@
     <public name="mapbox_mylocation_icon_default" type="drawable" />
     <public name="mapbox_mylocation_icon_bearing" type="drawable" />
 
+    <!-- Exposed colors -->
     <public name="mapbox_mylocation_ring" type="color" />
     <public name="mapbox_blue" type="color" />
 </resources>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
index 5c067c2a86..2532ee26eb 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
@@ -3,48 +3,47 @@
     <declare-styleable name="mapbox_MapView">
 
         <!--Configuration-->
-        <attr name="mapbox_access_token" format="string" />
-        <attr name="mapbox_style_url" format="string" />
-        <attr name="mapbox_api_base_url" format="string" />
+        <attr name="mapbox_accessToken" format="string" />
+        <attr name="mapbox_styleUrl" format="string" />
+        <attr name="mapbox_apiBaseUrl" format="string" />
 
         <!--Camera-->
-        <attr name="mapbox_center_longitude" format="float" />
-        <attr name="mapbox_center_latitude" format="float" />
-        <attr name="mapbox_zoom" format="float" />
-        <attr name="mapbox_direction" format="float" />
-        <attr name="mapbox_tilt" format="float" />
+        <attr name="mapbox_cameraTargetLat" format="float" />
+        <attr name="mapbox_cameraTargetLng" format="float" />
+        <attr name="mapbox_cameraZoom" format="float" />
+        <attr name="mapbox_cameraBearing" format="float" />
+        <attr name="mapbox_cameraTilt" format="float" />
 
         <!--Zoom-->
-        <attr name="mapbox_zoom_max" format="float" />
-        <attr name="mapbox_zoom_min" format="float" />
+        <attr name="mapbox_cameraZoomMax" format="float" />
+        <attr name="mapbox_cameraZoomMin" format="float" />
 
         <!--Gestures-->
-        <attr name="mapbox_zoom_enabled" format="boolean" />
-        <attr name="mapbox_scroll_enabled" format="boolean" />
-        <attr name="mapbox_rotate_enabled" format="boolean" />
-        <attr name="mapbox_tilt_enabled" format="boolean" />
-        <attr name="mapbox_debug_active" format="boolean" />
+        <attr name="mapbox_uiZoomGestures" format="boolean" />
+        <attr name="mapbox_uiScrollGestures" format="boolean" />
+        <attr name="mapbox_uiRotateGestures" format="boolean" />
+        <attr name="mapbox_uiTiltGestures" format="boolean" />
 
         <!--UI-Controls-->
-        <attr name="mapbox_zoom_controls_enabled" format="boolean" />
+        <attr name="mapbox_uiZoomControls" format="boolean" />
 
         <!--MyLocation-->
-        <attr name="mapbox_my_location_enabled" format="boolean" />
-        <attr name="mapbox_my_location_foreground" format="reference" />
-        <attr name="mapbox_my_location_foreground_bearing" format="reference" />
-        <attr name="mapbox_my_location_foreground_tint" format="color" />
-        <attr name="mapbox_my_location_background" format="reference" />
-        <attr name="mapbox_my_location_background_tint" format="color" />
-        <attr name="mapbox_my_location_background_left" format="dimension" />
-        <attr name="mapbox_my_location_background_top" format="dimension" />
-        <attr name="mapbox_my_location_background_right" format="dimension" />
-        <attr name="mapbox_my_location_background_bottom" format="dimension" />
-        <attr name="mapbox_my_location_accuracy_tint" format="color" />
-        <attr name="mapbox_my_location_accuracy_alpha" format="integer" />
+        <attr name="mapbox_myLocation" format="boolean" />
+        <attr name="mapbox_myLocationTintColor" format="color" />
+        <attr name="mapbox_myLocationDrawable" format="reference" />
+        <attr name="mapbox_myLocationBearingDrawable" format="reference" />
+        <attr name="mapbox_myLocationBackgroundDrawable" format="reference" />
+        <attr name="mapbox_myLocationBackgroundTintColor" format="color" />
+        <attr name="mapbox_myLocationBackgroundMarginLeft" format="dimension" />
+        <attr name="mapbox_myLocationBackgroundMarginTop" format="dimension" />
+        <attr name="mapbox_myLocationBackgroundMarginRight" format="dimension" />
+        <attr name="mapbox_myLocationBackgroundMarginBottom" format="dimension" />
+        <attr name="mapbox_myLocationAccuracyTintColor" format="color" />
+        <attr name="mapbox_myLocationAccuracyAlpha" format="integer" />
 
         <!--Compass-->
-        <attr name="mapbox_compass_enabled" format="boolean" />
-        <attr name="mapbox_compass_gravity">
+        <attr name="mapbox_uiCompass" format="boolean" />
+        <attr name="mapbox_uiCompassGravity">
             <flag name="top" value="0x30" />
             <flag name="bottom" value="0x50" />
             <flag name="left" value="0x03" />
@@ -60,14 +59,15 @@
             <flag name="start" value="0x00800003" />
             <flag name="end" value="0x00800005" />
         </attr>
-        <attr name="mapbox_compass_margin_left" format="dimension" />
-        <attr name="mapbox_compass_margin_top" format="dimension" />
-        <attr name="mapbox_compass_margin_right" format="dimension" />
-        <attr name="mapbox_compass_margin_bottom" format="dimension" />
-        <attr name="mapbox_compass_fade_facing_north" format="boolean" />
+        <attr name="mapbox_uiCompassMarginLeft" format="dimension" />
+        <attr name="mapbox_uiCompassMarginTop" format="dimension" />
+        <attr name="mapbox_uiCompassMarginRight" format="dimension" />
+        <attr name="mapbox_uiCompassMarginBottom" format="dimension" />
+        <attr name="mapbox_uiCompassFadeFacingNorth" format="boolean" />
 
         <!--Logo-->
-        <attr name="mapbox_logo_gravity">
+        <attr name="mapbox_uiLogo" format="boolean" />
+        <attr name="mapbox_uiLogoGravity">
             <flag name="top" value="0x30" />
             <flag name="bottom" value="0x50" />
             <flag name="left" value="0x03" />
@@ -83,14 +83,14 @@
             <flag name="start" value="0x00800003" />
             <flag name="end" value="0x00800005" />
         </attr>
-        <attr name="mapbox_logo_margin_left" format="dimension" />
-        <attr name="mapbox_logo_margin_top" format="dimension" />
-        <attr name="mapbox_logo_margin_right" format="dimension" />
-        <attr name="mapbox_logo_margin_bottom" format="dimension" />
-        <attr name="mapbox_logo_enabled" format="boolean" />
+        <attr name="mapbox_uiLogoMarginLeft" format="dimension" />
+        <attr name="mapbox_uiLogoMarginTop" format="dimension" />
+        <attr name="mapbox_uiLogoMarginRight" format="dimension" />
+        <attr name="mapbox_uiLogoMarginBottom" format="dimension" />
 
         <!--Attribution-->
-        <attr name="mapbox_attribution_gravity">
+        <attr name="mapbox_uiAttribution" format="boolean" />
+        <attr name="mapbox_uiAttributionGravity">
             <flag name="top" value="0x30" />
             <flag name="bottom" value="0x50" />
             <flag name="left" value="0x03" />
@@ -106,14 +106,14 @@
             <flag name="start" value="0x00800003" />
             <flag name="end" value="0x00800005" />
         </attr>
-        <attr name="mapbox_attribution_margin_left" format="dimension" />
-        <attr name="mapbox_attribution_margin_top" format="dimension" />
-        <attr name="mapbox_attribution_margin_right" format="dimension" />
-        <attr name="mapbox_attribution_margin_bottom" format="dimension" />
-        <attr name="mapbox_attribution_enabled" format="boolean" />
-        <attr name="mapbox_attribution_tint" format="color" />
+        <attr name="mapbox_uiAttributionMarginLeft" format="dimension" />
+        <attr name="mapbox_uiAttributionMarginTop" format="dimension" />
+        <attr name="mapbox_uiAttributionMarginRight" format="dimension" />
+        <attr name="mapbox_uiAttributionMarginBottom" format="dimension" />
+        <attr name="mapbox_uiAttributionTintColor" format="color" />
 
         <!-- Deprecated to use TextureView-->
-        <attr name="mapbox_texture_mode" format="boolean" />
+        <attr name="mapbox_renderTextureMode" format="boolean" />
+
     </declare-styleable>
 </resources>