[android] - update style constants, add testupstream/tvn-update-core-styles

2 files changed, 43 insertions, 1 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 9943a72e06..ab31dd4097 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
@@ -22,7 +22,8 @@ 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, LIGHT, DARK, SATELLITE, SATELLITE_STREETS, TRAFFIC_DAY, TRAFFIC_NIGHT})
+  @StringDef( {MAPBOX_STREETS, OUTDOORS, LIGHT, DARK, SATELLITE, SATELLITE_STREETS, TRAFFIC_DAY, TRAFFIC_NIGHT,
+    NAVIGATION_GUIDANCE_DAY, NAVIGATION_GUIDANCE_NIGHT, NAVIGATION_PREVIEW_DAY, NAVIGATION_PREVIEW_NIGHT})
   @Retention(RetentionPolicy.SOURCE)
   public @interface StyleUrl {
   }
@@ -73,7 +74,10 @@ public class Style {
    * <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select
    * countries</a>. Using this constant means your map style will always use the latest version and
    * may change as we improve the style.
+   *
+   * @deprecated Use {@link Style#NAVIGATION_PREVIEW_DAY} and {@link Style#NAVIGATION_GUIDANCE_DAY} instead.
    */
+  @Deprecated
   public static final String TRAFFIC_DAY = "mapbox://styles/mapbox/traffic-day-v2";
 
   /**
@@ -82,6 +86,37 @@ public class Style {
    * <a href="https://www.mapbox.com/api-documentation/pages/traffic-countries.html">these select
    * countries</a>. Using this constant means your map style will always use the latest version and
    * may change as we improve the style.
+   *
+   * @deprecated Use {@link Style#NAVIGATION_PREVIEW_NIGHT} and {@link Style#NAVIGATION_GUIDANCE_NIGHT} instead.
    */
+  @Deprecated
   public static final String TRAFFIC_NIGHT = "mapbox://styles/mapbox/traffic-night-v2";
+
+  /**
+   * Navigation Preview Day: TBA.
+   * Using this constant means your map style will always use the latest version and
+   * may change as we improve the style.
+   */
+  public static final String NAVIGATION_PREVIEW_DAY = "mapbox://styles/mapbox/navigation-preview-day-v2";
+
+  /**
+   * Navigation Guidance Day: TBA.
+   * Using this constant means your map style will always use the latest version and
+   * may change as we improve the style.
+   */
+  public static final String NAVIGATION_GUIDANCE_DAY = "mapbox://styles/mapbox/navigation-guidance-day-v2";
+
+  /**
+   * Navigation Preview Night: TBA.
+   * Using this constant means your map style will always use the latest version and
+   * may change as we improve the style.
+   */
+  public static final String NAVIGATION_PREVIEW_NIGHT = "mapbox://styles/mapbox/navigation-preview-night-v2";
+
+  /**
+   * Navigation Guidance Night: TBA.
+   * Using this constant means your map style will always use the latest version and
+   * may change as we improve the style.
+   */
+  public static final String NAVIGATION_GUIDANCE_NIGHT = "mapbox://styles/mapbox/navigation-guidance-night-v2";
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index 65fb3e14a3..c985381560 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
@@ -24,6 +24,13 @@
     <string name="mapbox_style_dark" translatable="false">mapbox://styles/mapbox/dark-v9</string>
     <string name="mapbox_style_satellite" translatable="false">mapbox://styles/mapbox/satellite-v9</string>
     <string name="mapbox_style_satellite_streets" translatable="false">mapbox://styles/mapbox/satellite-streets-v10</string>
+    <!--DEPRECATED use mapbox_style_navigation_preview_day or mapbox_style_navigation_guidance_day instead-->
     <string name="mapbox_style_traffic_day" translatable="false">mapbox://styles/mapbox/traffic-day-v2</string>
+    <!--DEPRECATED use mapbox_style_navigation_preview_night or mapbox_style_navigation_guidance_night instead-->
     <string name="mapbox_style_traffic_night" translatable="false">mapbox://styles/mapbox/traffic-night-v2</string>
+    <string name="mapbox_style_navigation_preview_day" translatable="false">mapbox://styles/mapbox/navigation-preview-day-v2</string>
+    <string name="mapbox_style_navigation_guidance_day" translatable="false">mapbox://styles/mapbox/navigation-guidance-day-v2</string>
+    <string name="mapbox_style_navigation_preview_night" translatable="false">mapbox://styles/mapbox/navigation-preview-night-v2</string>
+    <string name="mapbox_style_navigation_guidance_night" translatable="false">mapbox://styles/mapbox/navigation-guidance-night-v2</string>
+
 </resources>