Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

4924 make gesture focal point configurable #5332

Merged

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Jun 13, 2016

Closes #4924

@tobrun tobrun added the Android Mapbox Maps SDK for Android label Jun 13, 2016
@tobrun tobrun added this to the android-v4.1.0 milestone Jun 13, 2016
@bleege
Copy link
Contributor

bleege commented Jun 13, 2016

Restarted tests and now good to go! Will squash and merge.

@bleege bleege force-pushed the 4924-make-gesture-focal-point-configurable branch from 3ed38b8 to 818f33c Compare June 13, 2016 20:26
@bleege
Copy link
Contributor

bleege commented Jun 13, 2016

Squashed and then while rebasing on to release-android-v4.1.0 discovered a merge conflict. Will address next.

@bleege bleege force-pushed the 4924-make-gesture-focal-point-configurable branch from 818f33c to b3467a5 Compare June 13, 2016 20:35
@bleege bleege merged commit b3467a5 into release-android-v4.1.0 Jun 13, 2016
@bleege
Copy link
Contributor

bleege commented Jun 13, 2016

Rebased after squashing UiSettings.java conflict and then merged!

@bleege bleege deleted the 4924-make-gesture-focal-point-configurable branch June 13, 2016 20:36
@zugaldia zugaldia mentioned this pull request Jun 20, 2016
9 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants