[android] - rename attributes (#6894)

31 files changed, 266 insertions, 246 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>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
index 9cb9f4dbd6..e0e2cbfdab 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:mapbox_center_latitude="52.519003"
-        app:mapbox_center_longitude="13.400972"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="16"
+        app:mapbox_cameraTargetLat="52.519003"
+        app:mapbox_cameraTargetLng="13.400972"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
index 8ac30bcf2b..6534c23c72 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:mapbox_center_latitude="51.502615"
-        app:mapbox_center_longitude="4.972326"
-        app:mapbox_style_url="@string/mapbox_style_light"
-        app:mapbox_zoom="6" />
+        app:mapbox_cameraTargetLat="51.502615"
+        app:mapbox_cameraTargetLng="4.972326"
+        app:mapbox_styleUrl="@string/mapbox_style_light"
+        app:mapbox_cameraZoom="6" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
index ba1f4c17df..8a139083f8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar"
-        app:mapbox_center_latitude="51.50325"
-        app:mapbox_center_longitude="-0.11968"
-        app:mapbox_zoom="15" />
+        app:mapbox_cameraTargetLat="51.50325"
+        app:mapbox_cameraTargetLng="-0.11968"
+        app:mapbox_cameraZoom="15" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
index 0cded42204..a1d7a8351d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
@@ -21,7 +21,7 @@
             android:id="@id/mapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
+            app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" />
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
index 5af41a0ab7..f52d5e70c2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
@@ -16,9 +16,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_my_location_foreground_tint="@color/primary"
-        app:mapbox_my_location_accuracy_tint="@color/primary"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="15" />
+        app:mapbox_myLocationTintColor="@color/primary"
+        app:mapbox_myLocationAccuracyTintColor="@color/primary"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
index 9cb9f4dbd6..e0e2cbfdab 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:mapbox_center_latitude="52.519003"
-        app:mapbox_center_longitude="13.400972"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="16"
+        app:mapbox_cameraTargetLat="52.519003"
+        app:mapbox_cameraTargetLng="13.400972"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
index ba3c5fbd30..bc100b6059 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
@@ -16,6 +16,6 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
index ec622e48cc..2625e65bbf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
@@ -26,12 +26,12 @@
                 android:id="@id/mapView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:mapbox_center_latitude="51.506675"
-                app:mapbox_center_longitude="-0.128699"
-                app:mapbox_compass_fade_facing_north="false"
-                app:mapbox_direction="90"
-                app:mapbox_tilt="40"
-                app:mapbox_zoom="10" />
+                app:mapbox_cameraTargetLat="51.506675"
+                app:mapbox_cameraTargetLng="-0.128699"
+                app:mapbox_uiCompassFadeFacingNorth="false"
+                app:mapbox_cameraBearing="90"
+                app:mapbox_cameraTilt="40"
+                app:mapbox_cameraZoom="10" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
index 256f94fa99..d13d16a73e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="5"
-        app:mapbox_center_latitude="38.90962"
-        app:mapbox_center_longitude="-77.04341"
-        app:mapbox_zoom="15" />
+        app:mapbox_cameraTargetLat="38.90962"
+        app:mapbox_cameraTargetLng="-77.04341"
+        app:mapbox_cameraZoom="15" />
 
     <TextView
         android:id="@+id/message"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
index 97f4e01e54..1c8e33fb33 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_center_latitude="38.897705003219784"
-        app:mapbox_center_longitude="-77.03655168667463"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="15" />
+        app:mapbox_cameraTargetLat="38.897705003219784"
+        app:mapbox_cameraTargetLng="-77.03655168667463"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
index a41063f285..134c3f331e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_center_latitude="47.798202"
-        app:mapbox_center_longitude="7.573781"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="4" />
+        app:mapbox_cameraTargetLat="47.798202"
+        app:mapbox_cameraTargetLng="7.573781"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="4" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
index a41063f285..134c3f331e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_center_latitude="47.798202"
-        app:mapbox_center_longitude="7.573781"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="4" />
+        app:mapbox_cameraTargetLat="47.798202"
+        app:mapbox_cameraTargetLng="7.573781"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="4" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
index 7dfdd5da06..3732326f39 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
@@ -14,10 +14,10 @@
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@id/mapView"
-        app:mapbox_center_latitude="50.871062"
-        app:mapbox_center_longitude="1.583210"
-        app:mapbox_direction="220"
-        app:mapbox_zoom="10"
+        app:mapbox_cameraTargetLat="50.871062"
+        app:mapbox_cameraTargetLng="1.583210"
+        app:mapbox_cameraBearing="220"
+        app:mapbox_cameraZoom="10"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar" />
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
index 4b2b7385b1..229d8e87c1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
@@ -22,11 +22,11 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_center_latitude="38.87031"
+        app:mapbox_cameraTargetLat="38.87031"
         android:layout_below="@id/toolbar"
-        app:mapbox_center_longitude="-77.00897"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="10" />
+        app:mapbox_cameraTargetLng="-77.00897"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="10" />
 
     <TextView
         android:id="@+id/countView"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
index 6a292a4e83..f06975466b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
@@ -16,10 +16,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        app:mapbox_center_latitude="38.907192"
-        app:mapbox_center_longitude="-77.036871"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="12" />
+        app:mapbox_cameraTargetLat="38.907192"
+        app:mapbox_cameraTargetLng="-77.036871"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="12" />
 
     <TextView
         android:id="@+id/countView"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
index 11cb2ca984..afa769d58d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
@@ -52,9 +52,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        app:mapbox_center_latitude="38.907192"
-        app:mapbox_center_longitude="-77.036871"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="12" />
+        app:mapbox_cameraTargetLat="38.907192"
+        app:mapbox_cameraTargetLng="-77.036871"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="12" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
index 1e31e9cc4f..20de7c00bf 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:mapbox_center_latitude="-1.063510"
-        app:mapbox_center_longitude=" 32.895425"
-        app:mapbox_style_url="@string/mapbox_style_satellite_streets"
-        app:mapbox_zoom="4" />
+        app:mapbox_cameraTargetLat="-1.063510"
+        app:mapbox_cameraTargetLng=" 32.895425"
+        app:mapbox_styleUrl="@string/mapbox_style_satellite_streets"
+        app:mapbox_cameraZoom="4" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
index 586af46e8a..95f084506b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
@@ -42,9 +42,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_my_location_foreground_tint="@color/primary"
-        app:mapbox_my_location_accuracy_tint="@color/primary"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="15" />
+        app:mapbox_myLocationTintColor="@color/primary"
+        app:mapbox_myLocationAccuracyTintColor="@color/primary"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
index 61caaef04e..d856676260 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
@@ -17,11 +17,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar"
-        app:mapbox_attribution_tint="@android:color/holo_green_dark"
-        app:mapbox_center_latitude="47.798202"
-        app:mapbox_center_longitude="7.573781"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="4" />
+        app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark"
+        app:mapbox_cameraTargetLat="47.798202"
+        app:mapbox_cameraTargetLng="7.573781"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="4" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
index 36c8a8c476..f5a9a17917 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
@@ -17,12 +17,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:mapbox_attribution_gravity="top|end"
-        app:mapbox_center_latitude="45.1855569"
-        app:mapbox_center_longitude="5.7215506"
-        app:mapbox_logo_gravity="top|end"
-        app:mapbox_logo_margin_right="10dp"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="11" />
+        app:mapbox_uiAttributionGravity="top|end"
+        app:mapbox_cameraTargetLat="45.1855569"
+        app:mapbox_cameraTargetLng="5.7215506"
+        app:mapbox_uiLogoGravity="top|end"
+        app:mapbox_uiLogoMarginRight="10dp"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="11" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
index e1931585bc..5e80a0e1b6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
@@ -80,10 +80,10 @@
                 android:id="@id/mapView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:mapbox_center_latitude="37.176546"
-                app:mapbox_center_longitude="-3.599007"
-                app:mapbox_style_url="@string/mapbox_style_emerald"
-                app:mapbox_zoom="15" />
+                app:mapbox_cameraTargetLat="37.176546"
+                app:mapbox_cameraTargetLng="-3.599007"
+                app:mapbox_styleUrl="@string/mapbox_style_emerald"
+                app:mapbox_cameraZoom="15" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
index 9cb9f4dbd6..e0e2cbfdab 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:mapbox_center_latitude="52.519003"
-        app:mapbox_center_longitude="13.400972"
-        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
-        app:mapbox_zoom="16"
+        app:mapbox_cameraTargetLat="52.519003"
+        app:mapbox_cameraTargetLng="13.400972"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"
+        app:mapbox_cameraZoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
index 2d18e4cda3..364e86adda 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:mapbox_style_url="@string/mapbox_style_light" />
+        app:mapbox_styleUrl="@string/mapbox_style_light" />
 
     <FrameLayout
         android:id="@+id/container"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
index 6c8df08a20..b640f9f878 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
@@ -27,11 +27,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        mapbox:mapbox_attribution_gravity="top"
-        mapbox:mapbox_center_latitude="34.4021"
-        mapbox:mapbox_center_longitude="-119.7081"
-        mapbox:mapbox_logo_gravity="top"
-        mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
-        mapbox:mapbox_zoom="13" />
+        mapbox:mapbox_uiAttributionGravity="top"
+        mapbox:mapbox_cameraTargetLat="34.4021"
+        mapbox:mapbox_cameraTargetLng="-119.7081"
+        mapbox:mapbox_uiLogoGravity="top"
+        mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9"
+        mapbox:mapbox_cameraZoom="13" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
index afdd6f38f7..91a68232e6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
@@ -10,9 +10,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        mapbox:mapbox_center_latitude="47.6077"
-        mapbox:mapbox_center_longitude="-122.3421"
-        mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
-        mapbox:mapbox_zoom="11"/>
+        mapbox:mapbox_cameraTargetLat="47.6077"
+        mapbox:mapbox_cameraTargetLng="-122.3421"
+        mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9"
+        mapbox:mapbox_cameraZoom="11"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
index 4454b252ed..71931c1467 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java
@@ -46,11 +46,11 @@ public class CameraPositionTest {
         float tilt = 44;
 
         TypedArray typedArray = mock(TypedArray.class);
-        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_direction, 0.0f)).thenReturn(bearing);
-        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_latitude, 0.0f)).thenReturn(latitude);
-        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_center_longitude, 0.0f)).thenReturn(longitude);
-        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_zoom, 0.0f)).thenReturn(zoom);
-        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_tilt, 0.0f)).thenReturn(tilt);
+        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraBearing, 0.0f)).thenReturn(bearing);
+        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLat, 0.0f)).thenReturn(latitude);
+        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLng, 0.0f)).thenReturn(longitude);
+        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoom, 0.0f)).thenReturn(zoom);
+        when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTilt, 0.0f)).thenReturn(tilt);
         doNothing().when(typedArray).recycle();
 
         CameraPosition cameraPosition = new CameraPosition.Builder(typedArray).build();
diff --git a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
index d3d49f2f34..948f92e30b 100644
--- a/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
+++ b/platform/android/MapboxGLAndroidSDKWearTestApp/src/main/res/layout/activity_simple_mapview.xml
@@ -13,10 +13,10 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        mapbox:mapbox_center_latitude="40.73581"
-        mapbox:mapbox_center_longitude="-73.99155"
-        mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
-        mapbox:mapbox_zoom="11"
-        mapbox:mapbox_zoom_controls_enabled="false"/>
+        mapbox:mapbox_cameraTargetLat="40.73581"
+        mapbox:mapbox_cameraTargetLng="-73.99155"
+        mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v9"
+        mapbox:mapbox_cameraZoom="11"
+        mapbox:mapbox_uiZoomControls="false"/>
 
 </FrameLayout>
\ No newline at end of file