diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-01-18 18:26:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-18 18:26:58 +0100 |
commit | c637a658db64c69c6052836790f5e6ef7bcda69c (patch) | |
tree | a939867737cfbd75089943a104be31b7fa8bb9de | |
parent | 89193f7ab03cecaa88c4413b3b54f837c2effc56 (diff) | |
download | qtlocation-mapboxgl-c637a658db64c69c6052836790f5e6ef7bcda69c.tar.gz |
[android] - remove deprecated emerald (#7767)
[android] - remove deprecation annoation for setStyle
[android] - dismiss tracking on gesture deprecation cleanup
6 files changed, 6 insertions, 39 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java index 574ef4afa6..d55fd4c023 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java @@ -23,7 +23,7 @@ public class Style { * constants means your map style will always use the latest version and may change as we * improve the style */ - @StringDef( {MAPBOX_STREETS, OUTDOORS, EMERALD, LIGHT, DARK, SATELLITE, SATELLITE_STREETS}) + @StringDef( {MAPBOX_STREETS, OUTDOORS, LIGHT, DARK, SATELLITE, SATELLITE_STREETS}) @Retention(RetentionPolicy.SOURCE) public @interface StyleUrl { } @@ -44,14 +44,6 @@ public class Style { public static final String OUTDOORS = "mapbox://styles/mapbox/outdoors-v9"; /** - * Emerald: A versatile style, with emphasis on road networks and public transit. - * - * @deprecated this style has been deprecated and will be removed in future versions. - */ - @Deprecated - public static final String EMERALD = "mapbox://styles/mapbox/emerald-v8"; - - /** * Light: Subtle light backdrop for data visualizations. Using this constant means your map * style will always use the latest version and may change as we improve the style. */ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index f460a77229..2fa7fc4641 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -824,7 +824,6 @@ public final class MapboxMap { * @deprecated use {@link #setStyleUrl(String)} instead with versioned url methods from {@link Style} */ @UiThread - @Deprecated public void setStyle(@Style.StyleUrl String style) { setStyleUrl(style); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java index 28591cf68c..ff8d92d116 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java @@ -153,17 +153,6 @@ public final class TrackingSettings { } /** - * Returns if the tracking modes will be dismissed when a gesture occurs. - * - * @return True to indicate the tracking modes will be dismissed. - * @deprecated use @link #isAllDismissTrackingOnGestureinstead - */ - @Deprecated - public boolean isDismissTrackingOnGesture() { - return dismissLocationTrackingOnGesture && dismissBearingTrackingOnGesture; - } - - /** * Returns if all tracking modes will be dismissed when a gesture occurs. * * @return True to indicate that location and bearing tracking will be dismissed. @@ -175,17 +164,6 @@ public final class TrackingSettings { /** * Set the dismissal of the tracking modes if a gesture occurs. * - * @param dismissTrackingOnGesture True to dismiss the tracking modes. - * @deprecated use @link #setDismissAllTrackingOnGesture instead - */ - @Deprecated - public void setDismissTrackingOnGesture(boolean dismissTrackingOnGesture) { - setDismissAllTrackingOnGesture(dismissTrackingOnGesture); - } - - /** - * Set the dismissal of the tracking modes if a gesture occurs. - * * @param dismissTrackingOnGesture True to dismiss all the tracking modes. */ public void setDismissAllTrackingOnGesture(boolean dismissTrackingOnGesture) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index f15979efc1..5905878350 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -18,8 +18,6 @@ may change as we improve the style. --> <string name="mapbox_style_mapbox_streets">mapbox://styles/mapbox/streets-v9</string> <string name="mapbox_style_outdoors">mapbox://styles/mapbox/outdoors-v9</string> - <!-- Note: Emerald style has been deprecated and will be removed in a future release--> - <string name="mapbox_style_emerald">mapbox://styles/mapbox/emerald-v8</string> <string name="mapbox_style_light">mapbox://styles/mapbox/light-v9</string> <string name="mapbox_style_dark">mapbox://styles/mapbox/dark-v9</string> <string name="mapbox_style_satellite">mapbox://styles/mapbox/satellite-v9</string> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index 5e80a0e1b6..46734ed82d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -82,7 +82,7 @@ android:layout_height="match_parent" app:mapbox_cameraTargetLat="37.176546" app:mapbox_cameraTargetLng="-3.599007" - app:mapbox_styleUrl="@string/mapbox_style_emerald" + app:mapbox_styleUrl="@string/mapbox_style_dark" app:mapbox_cameraZoom="15" /> <android.support.design.widget.FloatingActionButton diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java index 57f3b942af..150f638e1c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java @@ -44,15 +44,15 @@ public class TrackingSettingsTest { @Test public void testDismissTrackingModesOnGesture() { - trackingSettings.setDismissTrackingOnGesture(false); - assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isDismissTrackingOnGesture()); + trackingSettings.setDismissAllTrackingOnGesture(false); + assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isAllDismissTrackingOnGesture()); } @Test public void testValidateGesturesForTrackingModes() { - trackingSettings.setDismissTrackingOnGesture(false); + trackingSettings.setDismissAllTrackingOnGesture(false); trackingSettings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW); - assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isDismissTrackingOnGesture()); + assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isAllDismissTrackingOnGesture()); } @Test |