diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
| commit | 797f622a26b34db5a30e7f1728d87c6700a2ec1e (patch) | |
| tree | 75ea93979db2baf3eb2234c6fbb3d1a9c5b70329 /platform/android/MapboxGLAndroidSDK/src/main/res-public/values | |
| parent | 86fc3f525e42d042f239876b93525ff411ad7182 (diff) | |
| parent | 520df7f02049cdbbb9e68041e755d6c3a8d5b21f (diff) | |
| download | qtlocation-mapboxgl-797f622a26b34db5a30e7f1728d87c6700a2ec1e.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into bwg-vs2017
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/res-public/values')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml | 1 |
1 files changed, 1 insertions, 0 deletions
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 8acb0c27cc..1c3653479a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -10,6 +10,7 @@ <!-- Exposed attrs.xml --> <!--Configuration--> <public name="mapbox_styleUrl" type="attr" /> + <public name="mapbox_styleJson" type="attr" /> <public name="mapbox_apiBaseUrl" type="attr" /> <public name="mapbox_localIdeographFontFamily" type="attr" /> <public name="mapbox_pixelRatio" type="float" /> |