diff options
| author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-20 17:32:23 +0200 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2017-07-21 15:04:36 +0200 |
| commit | b34a5ab276145dd5499133738caf0e8d6d30ddb7 (patch) | |
| tree | c4c98d10998241c7740c1d74f42b4724d531aa30 | |
| parent | 820c04efbfa5c7e30bf5ff055538ccdd6e11b14d (diff) | |
| download | qtlocation-mapboxgl-b34a5ab276145dd5499133738caf0e8d6d30ddb7.tar.gz | |
[android] - update change log, fix typo public xml
| -rw-r--r-- | platform/android/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 33ac486964..b2eaaa2a9c 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -15,6 +15,10 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to * VisibleRegion logic [#9428](https://github.com/mapbox/mapbox-gl-native/pull/9428) * Validate motion event [#9434](https://github.com/mapbox/mapbox-gl-native/pull/9434) * Add French localization [#9545](https://github.com/mapbox/mapbox-gl-native/pull/9545) +* Fix public.xml [#9525](https://github.com/mapbox/mapbox-gl-native/pull/9525/files) +* Manage InfoWindow selection in AnnotationManager [#9567](https://github.com/mapbox/mapbox-gl-native/pull/9567) +* Increase touch target size [#9565](https://github.com/mapbox/mapbox-gl-native/pull/9565) +* Work around Adreno 2xx GPU bugs [#9573](https://github.com/mapbox/mapbox-gl-native/pull/9573) ## 5.1.0 - June 30, 2017 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 7294f43c02..f30cb7c27a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -20,7 +20,7 @@ <public name="mapbox_cameraTilt" type="attr" /> <!--Zoom--> - <public name="mapbox_cameraZoomMax" ftype="attr" /> + <public name="mapbox_cameraZoomMax" type="attr" /> <public name="mapbox_cameraZoomMin" type="attr" /> <!--Gestures--> |