summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2016-06-17 16:05:45 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2016-06-17 16:06:37 +0200
commit8c83af7b977d1091e3e3c35a47bce451488ba080 (patch)
tree1778b8aec546a0b80cbf296da173b64914721128 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
parent8e9b158e7347c00465d99f30f1220dff6c375178 (diff)
downloadqtlocation-mapboxgl-8c83af7b977d1091e3e3c35a47bce451488ba080.tar.gz
[android] #5299 - remove MarkerView x,y animation
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java86
1 files changed, 0 insertions, 86 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
index ba7d58b838..cee634c435 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
@@ -48,16 +48,6 @@ public class MarkerView extends Marker {
private boolean selected;
- private LatLng targetPosition;
- private boolean shouldAnimate;
- private boolean isAnimationRunning;
- private AnimatorSet set;
-
- private long startTime;
- private long duration;
- private long remainingTime;
- private AnimatorUtils.OnAnimationEndListener animationEndListener;
-
/**
* Publicly hidden default constructor
*/
@@ -354,82 +344,6 @@ public class MarkerView extends Marker {
markerViewManager = mapboxMap.getMarkerViewManager();
}
- @Override
- public void setPosition(LatLng position) {
- setPosition(position, 0);
- }
-
- public void setPosition(LatLng position, long duration) {
- setPosition(position, duration, null);
- }
-
- public void setPosition(LatLng position, long duration, AnimatorUtils.OnAnimationEndListener animationEndListener) {
- this.animationEndListener = animationEndListener;
-
- if (duration <= 0) {
- // update position instantly
- super.setPosition(position);
- if (markerViewManager != null) {
- markerViewManager.update();
- }
- } else {
- // animate using Android SDK animations
- this.targetPosition = position;
- if (markerViewManager != null) {
- markerViewManager.animatePosition(this, duration);
- }
- }
- }
-
- boolean shouldAnimate() {
- return shouldAnimate;
- }
-
- void setShouldAnimate(boolean animating) {
- shouldAnimate = animating;
- }
-
- boolean isAnimating() {
- return isAnimationRunning;
- }
-
- void setAnimating(boolean animationRunning) {
- isAnimationRunning = animationRunning;
- }
-
- LatLng getTargetPosition() {
- return targetPosition;
- }
-
- void setAnimation(AnimatorSet set) {
- this.set = set;
- }
-
- AnimatorSet getAnimation() {
- return set;
- }
-
- long getRemainingTime() {
- long time = duration - (AnimationUtils.currentAnimationTimeMillis() - startTime);
- return time > 0 ? time : 0;
- }
-
- void setDuration(long duration) {
- this.duration = duration;
- }
-
- void setStartTime(long startTime) {
- this.startTime = startTime;
- }
-
- AnimatorUtils.OnAnimationEndListener getAnimationEndListener() {
- return animationEndListener;
- }
-
- PointF getScreenLocation(@NonNull View convertView) {
- return new PointF(convertView.getX() + offsetX, convertView.getY() + offsetY);
- }
-
/**
* Get the String representation of a MarkerView.
*