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

Cherry pick release v4.2.0 #6944

Merged
merged 7 commits into from
Nov 9, 2016
Merged

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Nov 7, 2016

This PR cherry picks patch fixes made to release-android-v4.2.0 to master.

Capturing discussion with @ivovandongen: that the approach of patching master and cherry picking to release branch (reverse what happened here) is more logical in a multi platform project. This keeps changes between master/release branches minimal and makes resolving merge conflicts occur after development instead of occurring after release. From now on let's try to apply this as a best practice.

Review @ivovandongen

cc @mapbox/android

tobrun and others added 6 commits November 7, 2016 16:01
…ted marker rotation difference (#6826)

fix unit tests, input limiting is not handled by animateRotationBy instead of MarkerView.
Changed test to validate if method was called with correct value.
…found in current viewport, added example to the test app to test for regressions (#6877)
* [android] - allow onCancel to be invoked from camera cancel callbacks

* set to null after finish
* [android]  - using bearing clockwise versus counterclockwise

* fixup brackets
@tobrun tobrun added Android Mapbox Maps SDK for Android ✓ ready for review labels Nov 7, 2016
@tobrun tobrun added this to the android-v5.0.0 milestone Nov 7, 2016
@tobrun tobrun self-assigned this Nov 7, 2016
@mention-bot
Copy link

@tobrun, thanks for your PR! By analyzing the history of the files in this pull request, we identified @cammace, @bleege and @ljbade to be potential reviewers.

Copy link
Contributor

@ivovandongen ivovandongen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

@tobrun tobrun merged commit 772324e into master Nov 9, 2016
@tobrun tobrun deleted the tobrun-cherry-pick-release-v4.2.0 branch November 9, 2016 09:42
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.

4 participants