summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity
diff options
context:
space:
mode:
authorŁukasz Paczos <lukasz.paczos@mapbox.com>2018-03-20 13:03:06 +0100
committerGitHub <noreply@github.com>2018-03-20 13:03:06 +0100
commita2250098f5dc39a4486555e35823d634a8d0b786 (patch)
tree34776b9a3645f5e34260fb0932654ef5978f5bb3 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity
parentef1dcc0d5b5ae23b303ca736168f1452ea36ae77 (diff)
downloadqtlocation-mapboxgl-a2250098f5dc39a4486555e35823d634a8d0b786.tar.gz
[android] bumped gestures library version to 0.1.0 (#11483)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java14
1 files changed, 4 insertions, 10 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
index 2b79e2691d..c1698e20ab 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/GestureDetectorActivity.java
@@ -58,7 +58,6 @@ public class GestureDetectorActivity extends AppCompatActivity {
private Marker marker;
@Nullable
private LatLng focalPointLatLng;
- private boolean animationsEnabled = true;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -198,9 +197,7 @@ public class GestureDetectorActivity extends AppCompatActivity {
if (focalPointLatLng != null) {
gestureAlertsAdapter.addAlert(new GestureAlert(GestureAlert.TYPE_OTHER, "REVERTING MOVE THRESHOLD"));
- gesturesManager.getMoveGestureDetector().setMoveThreshold(
- gesturesManager.getMoveGestureDetector().getDefaultMoveThreshold()
- );
+ gesturesManager.getMoveGestureDetector().setMoveThreshold(0f);
}
}
});
@@ -242,8 +239,7 @@ public class GestureDetectorActivity extends AppCompatActivity {
mapboxMap.getUiSettings().setFocalPoint(mapboxMap.getProjection().toScreenLocation(focalPointLatLng));
return true;
case R.id.menu_gesture_animation:
- animationsEnabled = !animationsEnabled;
- mapboxMap.getUiSettings().setAllVelocityAnimationsEnabled(animationsEnabled);
+ mapboxMap.getUiSettings().setAllVelocityAnimationsEnabled(false);
}
return super.onOptionsItemSelected(item);
}
@@ -251,10 +247,8 @@ public class GestureDetectorActivity extends AppCompatActivity {
private void resetModes() {
focalPointLatLng = null;
mapboxMap.getUiSettings().setFocalPoint(null);
-
- gesturesManager.getMoveGestureDetector().setMoveThreshold(
- gesturesManager.getMoveGestureDetector().getDefaultMoveThreshold()
- );
+ gesturesManager.getMoveGestureDetector().setMoveThreshold(0f);
+ mapboxMap.getUiSettings().setAllVelocityAnimationsEnabled(true);
if (marker != null) {
mapboxMap.removeMarker(marker);