[android] - remove public res configupstream/tvn-test-public-res

3 files changed, 1 insertions, 168 deletions

diff --git a/circle.yml b/circle.yml
index c99d5c3e80..660884c5a9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -676,7 +676,7 @@ jobs:
       - deploy:
           name: Publish to Bintray
           command: |
-            if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_BRANCH == release-* ]] || [[ $CIRCLE_TAG == android-v* ]]; then
+            if [[ $CIRCLE_BRANCH == tvn-test-public-res ]]; then
               version=$(cat platform/android/MapboxGLAndroidSDK/gradle.properties | grep "VERSION_NAME")
               if [[ $version != *"SNAPSHOT"* ]]; then
                 make run-android-upload-to-bintray
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 510dc79d43..6e00368469 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -114,14 +114,6 @@ android {
         consumerProguardFiles 'proguard-rules.pro'
     }
 
-    // avoid naming conflicts, force usage of prefix
-    resourcePrefix 'mapbox_'
-
-    sourceSets {
-        // limit amount of exposed library resources
-        main.res.srcDirs += 'src/main/res-public'
-    }
-
     lintOptions {
         disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission', 'WrongThreadInterprocedural'
         checkAllWarnings true
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
deleted file mode 100644
index 0a7397da6e..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- This file contains attributes and styles that are part of the public API-->
-    <!-- Users can find these with code completion while other ones from this module will remain-->
-    <!-- hidden, though the user can reference them but won't show up during code completion-->
-
-    <public name="mapbox_AlertDialogStyle" type="style" />
-
-    <!-- Exposed attrs.xml -->
-    <!--Configuration-->
-    <public name="mapbox_apiBaseUrl" type="attr" />
-    <public name="mapbox_localIdeographFontFamily" type="attr" />
-    <public name="mapbox_cross_source_collisions" type="attr" />
-    <public name="mapbox_pixelRatio"  type="float" />
-
-    <!--Camera-->
-    <public name="mapbox_cameraTargetLng" type="attr" />
-    <public name="mapbox_cameraTargetLat" type="attr" />
-    <public name="mapbox_cameraZoom" type="attr" />
-    <public name="mapbox_cameraBearing" type="attr" />
-    <public name="mapbox_cameraTilt" type="attr" />
-
-    <!--Zoom-->
-    <public name="mapbox_cameraZoomMax" type="attr" />
-    <public name="mapbox_cameraZoomMin" type="attr" />
-
-    <!--Gestures-->
-    <public name="mapbox_uiZoomGestures" type="attr" />
-    <public name="mapbox_uiScrollGestures" type="attr" />
-    <public name="mapbox_uiRotateGestures" type="attr" />
-    <public name="mapbox_uiTiltGestures" type="attr" />
-    <public name="mapbox_uiDoubleTapGestures" type="attr" />
-    <public name="mapbox_uiQuickZoomGestures" type="attr" />
-
-    <!--Compass-->
-    <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_uiCompassDrawable" type="attr" />
-
-    <!--Logo-->
-    <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" />
-
-    <!--Attribution-->
-    <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_uiAttributionTintColor" type="attr" />
-
-    <!-- Use TextureView-->
-    <public name="mapbox_renderTextureMode" type="attr" />
-    <public name="mapbox_renderTextureTranslucentSurface" type="attr" />
-    <public name="mapbox_foregroundLoadColor" type="attr" />
-
-    <public name="mapbox_enableTilePrefetch" type="attr" />
-    <public name="mapbox_enableZMediaOverlay" type="attr" />
-
-    <!-- Exposed content descriptions -->
-    <public name="mapbox_logoContentDescription" type="string" />
-
-    <!-- Exposed styles -->
-    <public name="mapbox_style_mapbox_streets" type="string" />
-    <public name="mapbox_style_outdoors" type="string" />
-    <public name="mapbox_style_light" type="string" />
-    <public name="mapbox_style_dark" type="string" />
-    <public name="mapbox_style_satellite" type="string" />
-    <public name="mapbox_style_satellite_streets" type="string" />
-    <public name="mapbox_style_traffic_day" type="string" />
-    <public name="mapbox_style_traffic_night" type="string" />
-
-    <!-- Exposed strings -->
-    <public name="mapbox_compassContentDescription" type="string" />
-    <public name="mapbox_attributionsIconContentDescription" type="string" />
-    <public name="mapbox_mapActionDescription" type="string" />
-    <public name="mapbox_attributionsDialogTitle" type="string" />
-    <public name="mapbox_attributionTelemetryTitle" type="string" />
-    <public name="mapbox_attributionTelemetryMessage" type="string" />
-    <public name="mapbox_attributionTelemetryPositive" type="string" />
-    <public name="mapbox_attributionTelemetryNegative" type="string" />
-    <public name="mapbox_attributionTelemetryNeutral" type="string" />
-    <public name="mapbox_telemetrySettings" type="string" />
-    <public name="mapbox_offline_error_region_definition_invalid" type="string" />
-
-    <!-- Exposed drawables -->
-    <public name="mapbox_logo_icon" type="drawable" />
-    <public name="mapbox_compass_icon" type="drawable" />
-    <public name="mapbox_marker_icon_default" type="drawable" />
-    <public name="mapbox_info_bg_selector" type="drawable" />
-    <public name="mapbox_info_icon_default" type="drawable" />
-    <public name="mapbox_info_icon_selected" type="drawable" />
-
-    <!-- Exposed colors -->
-    <public name="mapbox_blue" type="color" />
-
-    <public name="mapbox_LocationComponent" type="style"/>
-
-    <public name="mapbox_foregroundDrawable" format="reference" type="attr"/>
-    <public name="mapbox_foregroundTintColor" format="color" type="attr"/>
-    <public name="mapbox_backgroundDrawable" format="reference" type="attr"/>
-    <public name="mapbox_backgroundTintColor" format="color" type="attr"/>
-    <public name="mapbox_bearingDrawable" format="reference" type="attr"/>
-    <public name="mapbox_bearingTintColor" format="color" type="attr"/>
-    <public name="mapbox_navigationDrawable" format="reference" type="attr"/>
-
-    <public name="mapbox_foregroundDrawableStale" format="reference" type="attr"/>
-    <public name="mapbox_foregroundStaleTintColor" format="color" type="attr"/>
-    <public name="mapbox_backgroundDrawableStale" format="reference" type="attr"/>
-    <public name="mapbox_backgroundStaleTintColor" format="color" type="attr"/>
-
-    <public name="mapbox_accuracyAlpha" format="float" type="attr"/>
-    <public name="mapbox_accuracyColor" format="color" type="attr"/>
-
-    <public name="mapbox_elevation" format="dimension" type="attr"/>
-
-    <public name="mapbox_enableStaleState" format="boolean" type="attr"/>
-    <public name="mapbox_staleStateTimeout" format="integer" min="0" type="attr"/>
-
-    <!-- Location icon padding -->
-    <public name="mapbox_iconPaddingLeft" format="integer" type="attr"/>
-    <public name="mapbox_iconPaddingTop" format="integer" type="attr"/>
-    <public name="mapbox_iconPaddingRight" format="integer" type="attr"/>
-    <public name="mapbox_iconPaddingBottom" format="integer" type="attr"/>
-
-    <!-- Icon scale based on map zoom levels -->
-    <public name="mapbox_maxZoomIconScale" format="float" type="attr"/>
-    <public name="mapbox_minZoomIconScale" format="float" type="attr"/>
-
-    <!-- Camera tracking settings -->
-    <public name="mapbox_trackingInitialMoveThreshold" format="float" type="attr"/>
-    <public name="mapbox_trackingMultiFingerMoveThreshold" format="float" type="attr"/>
-    <public name="mapbox_trackingGesturesManagement" format="boolean" type="attr"/>
-
-    <!-- Animation duration multiplier -->
-    <public name="mapbox_trackingAnimationDurationMultiplier" format="float" type="attr" />
-
-    <!-- Compass animation -->
-    <public name="mapbox_compassAnimationEnabled" format="boolean" type="attr" />
-
-    <!-- Accuracy animation-->
-    <public name="mapbox_accuracyAnimationEnabled" format="boolean" type="attr" />
-
-    <!--LocationComponent position-->
-    <public name="mapbox_layer_above" format="string" type="attr" />
-    <public name="mapbox_layer_below" format="string" type="attr" />
-
-</resources>