tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #3276 - hardware accelerate animations

Browse Source
This commit is contained in:
Tobrun
2016-05-20 09:45:35 +02:00
parent 952875a30c
commit d2fdf4a4ac
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
View File

@@ -706,7 +706,7 @@ public class MapboxMap {
final int animSelectRes = marker.getSelectAnimRes();
adaptedView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
public void onClick(final View v) {
boolean clickHandled = false;
if (mOnMarkerViewClickListener != null) {
clickHandled = mOnMarkerViewClickListener.onMarkerClick(marker, v, adapter);
@@ -714,6 +714,7 @@ public class MapboxMap {
if (!clickHandled) {
if (animSelectRes != 0) {
v.setLayerType(View.LAYER_TYPE_HARDWARE, null);
Animator animator = AnimatorInflater.loadAnimator(mMapView.getContext(), animSelectRes);
animator.setTarget(v);
animator.addListener(new AnimatorListenerAdapter() {
@@ -721,6 +722,7 @@ public class MapboxMap {
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
selectMarker(marker);
v.setLayerType(View.LAYER_TYPE_NONE, null);
}
});
animator.start();
@@ -1298,11 +1300,19 @@ public class MapboxMap {
}
if (marker instanceof MarkerView) {
View viewMarker = mMarkerViewMap.get(marker);
final View viewMarker = mMarkerViewMap.get(marker);
if (viewMarker != null) {
int deselectAnimatorRes = ((MarkerView) marker).getDeselectAnimRes();
if (deselectAnimatorRes != 0) {
viewMarker.setLayerType(View.LAYER_TYPE_HARDWARE, null);
Animator animator = AnimatorInflater.loadAnimator(mMapView.getContext(), deselectAnimatorRes);
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
viewMarker.setLayerType(View.LAYER_TYPE_NONE, null);
}
});
animator.setTarget(viewMarker);
animator.start();
}