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

[android] - remove deprecated emerald (#7767)

Browse Source 
[android] - remove deprecation annoation for setStyle

[android] - dismiss tracking on gesture deprecation cleanup
This commit is contained in:
Tobrun
2017-01-18 18:26:58 +01:00
committed by GitHub
parent 89193f7ab0
commit c637a658db
6 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
View File

@@ -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 {
}
@@ -43,14 +43,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.

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

@@ -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);
}

22
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
View File

@@ -152,17 +152,6 @@ public final class TrackingSettings {
return myLocationView.getMyBearingTrackingMode();
}
/**
* 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.
*
@@ -172,17 +161,6 @@ public final class TrackingSettings {
return dismissLocationTrackingOnGesture && dismissBearingTrackingOnGesture;
}
/**
* 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.
*

2
platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
View File

@@ -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>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
View File

@@ -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

8
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java
View File

@@ -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