diff options
author | Antonio Zugaldia <antonio@mapbox.com> | 2015-12-03 14:49:45 -0500 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-12-03 16:57:44 -0600 |
commit | da2dd0929b69488eca4ab64e118236e6958e9683 (patch) | |
tree | c1ae8b203791636a68a8675c16ec7d51217cec6b /android | |
parent | a4f10ef2c3cbad75c40cf6136b7ec9bf0c150125 (diff) | |
download | qtlocation-mapboxgl-da2dd0929b69488eca4ab64e118236e6958e9683.tar.gz |
[android] #2805 - public API to enable or disable tilt
Diffstat (limited to 'android')
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 36 | ||||
-rw-r--r-- | android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 71da8c38fb..d52f667001 100644 --- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -120,6 +120,7 @@ public final class MapView extends FrameLayout { private static final String STATE_ZOOM_ENABLED = "zoomEnabled"; private static final String STATE_SCROLL_ENABLED = "scrollEnabled"; private static final String STATE_ROTATE_ENABLED = "rotateEnabled"; + private static final String STATE_TILT_ENABLED = "tiltEnabled"; private static final String STATE_ZOOM_CONTROLS_ENABLED = "zoomControlsEnabled"; private static final String STATE_DEBUG_ACTIVE = "debugActive"; private static final String STATE_STYLE_URL = "styleUrl"; @@ -244,6 +245,7 @@ public final class MapView extends FrameLayout { private boolean mZoomEnabled = true; private boolean mScrollEnabled = true; private boolean mRotateEnabled = true; + private boolean mTiltEnabled = true; private boolean mAllowConcurrentMultipleOpenInfoWindows = false; private String mStyleUrl; @@ -730,6 +732,7 @@ public final class MapView extends FrameLayout { setZoomEnabled(typedArray.getBoolean(R.styleable.MapView_zoom_enabled, true)); setScrollEnabled(typedArray.getBoolean(R.styleable.MapView_scroll_enabled, true)); setRotateEnabled(typedArray.getBoolean(R.styleable.MapView_rotate_enabled, true)); + setTiltEnabled(typedArray.getBoolean(R.styleable.MapView_tilt_enabled, true)); setZoomControlsEnabled(typedArray.getBoolean(R.styleable.MapView_zoom_controls_enabled, isZoomControlsEnabled())); setDebugActive(typedArray.getBoolean(R.styleable.MapView_debug_active, false)); if (typedArray.getString(R.styleable.MapView_style_url) != null) { @@ -805,6 +808,7 @@ public final class MapView extends FrameLayout { setZoomEnabled(savedInstanceState.getBoolean(STATE_ZOOM_ENABLED)); setScrollEnabled(savedInstanceState.getBoolean(STATE_SCROLL_ENABLED)); setRotateEnabled(savedInstanceState.getBoolean(STATE_ROTATE_ENABLED)); + setTiltEnabled(savedInstanceState.getBoolean(STATE_TILT_ENABLED)); setZoomControlsEnabled(savedInstanceState.getBoolean(STATE_ZOOM_CONTROLS_ENABLED)); setDebugActive(savedInstanceState.getBoolean(STATE_DEBUG_ACTIVE)); setStyleUrl(savedInstanceState.getString(STATE_STYLE_URL)); @@ -885,6 +889,7 @@ public final class MapView extends FrameLayout { outState.putBoolean(STATE_ZOOM_ENABLED, isZoomEnabled()); outState.putBoolean(STATE_SCROLL_ENABLED, isScrollEnabled()); outState.putBoolean(STATE_ROTATE_ENABLED, isRotateEnabled()); + outState.putBoolean(STATE_TILT_ENABLED, isTiltEnabled()); outState.putBoolean(STATE_ZOOM_CONTROLS_ENABLED, isZoomControlsEnabled()); outState.putBoolean(STATE_DEBUG_ACTIVE, isDebugActive()); outState.putString(STATE_STYLE_URL, getStyleUrl()); @@ -1381,6 +1386,35 @@ public final class MapView extends FrameLayout { } // + // Tilt + // + + /** + * Returns whether the user may tilt the map. + * + * @return If true, tilting is enabled. + */ + @UiThread + public boolean isTiltEnabled() { + return mTiltEnabled; + } + + /** + * Changes whether the user may tilt the map. + * <p/> + * This setting controls only user interactions with the map. If you set the value to false, + * you may still change the map location programmatically. + * <p/> + * The default value is true. + * + * @param tiltEnabled If true, tilting is enabled. + */ + @UiThread + public void setTiltEnabled(boolean tiltEnabled) { + this.mTiltEnabled = tiltEnabled; + } + + // // InfoWindows // @@ -2425,11 +2459,13 @@ public final class MapView extends FrameLayout { * @see MapView#setZoomEnabled(boolean) * @see MapView#setScrollEnabled(boolean) * @see MapView#setRotateEnabled(boolean) + * @see MapView#setTiltEnabled(boolean) */ public void setAllGesturesEnabled(boolean enabled) { setZoomEnabled(enabled); setScrollEnabled(enabled); setRotateEnabled(enabled); + setTiltEnabled(enabled); } // Called when user touches the screen, all positions are absolute diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index ad8b600efb..35696850b7 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -8,6 +8,7 @@ <attr name="zoom_enabled" format="boolean" /> <attr name="scroll_enabled" format="boolean" /> <attr name="rotate_enabled" format="boolean" /> + <attr name="tilt_enabled" format="boolean" /> <attr name="zoom_controls_enabled" format="boolean" /> <attr name="debug_active" format="boolean" /> <attr name="style_url" format="string" /> |