From d49ff7e0e6bb1d5260960665d80edf6fb02710e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukasz.paczos@mapbox.com>
Date: Wed, 19 Dec 2018 16:03:10 +0100
Subject: [android] update core styles

includes:
streets-v11
outdoors-v11
light-v10
dark-v10
satellite-streets-v11

(cherry picked from commit 01a3780)
---
 .../src/main/java/com/mapbox/mapboxsdk/constants/Style.java    | 10 +++++-----
 .../android/MapboxGLAndroidSDK/src/main/res/values/strings.xml | 10 +++++-----
 .../src/main/res/layout/activity_multi_map.xml                 |  8 ++++----
 .../src/main/res/layout/fragment_dialog_map.xml                |  2 +-
 4 files changed, 15 insertions(+), 15 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..1624468c78 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
@@ -34,25 +34,25 @@ public class Style {
    * constant means your map style will always use the latest version and may change as we
    * improve the style.
    */
-  public static final String MAPBOX_STREETS = "mapbox://styles/mapbox/streets-v10";
+  public static final String MAPBOX_STREETS = "mapbox://styles/mapbox/streets-v11";
 
   /**
    * Outdoors: A general-purpose style tailored to outdoor activities. 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 OUTDOORS = "mapbox://styles/mapbox/outdoors-v10";
+  public static final String OUTDOORS = "mapbox://styles/mapbox/outdoors-v11";
 
   /**
    * 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.
    */
-  public static final String LIGHT = "mapbox://styles/mapbox/light-v9";
+  public static final String LIGHT = "mapbox://styles/mapbox/light-v10";
 
   /**
    * Dark: Subtle dark 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.
    */
-  public static final String DARK = "mapbox://styles/mapbox/dark-v9";
+  public static final String DARK = "mapbox://styles/mapbox/dark-v10";
 
   /**
    * Satellite: A beautiful global satellite and aerial imagery layer. Using this constant means
@@ -65,7 +65,7 @@ public class Style {
    * constant means your map style will always use the latest version and may change as we
    * improve the style.
    */
-  public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v10";
+  public static final String SATELLITE_STREETS = "mapbox://styles/mapbox/satellite-streets-v11";
 
   /**
    * Traffic Day: Color-coded roads based on live traffic congestion data. Traffic data is currently
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
index 693b62b2a9..e818cf88fd 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml
@@ -19,12 +19,12 @@
     <!-- these are public -->
     <!-- Using one of these constants means your map style will always use the latest version and
      may change as we improve the style. -->
-    <string name="mapbox_style_mapbox_streets" translatable="false">mapbox://styles/mapbox/streets-v10</string>
-    <string name="mapbox_style_outdoors" translatable="false">mapbox://styles/mapbox/outdoors-v10</string>
-    <string name="mapbox_style_light" translatable="false">mapbox://styles/mapbox/light-v9</string>
-    <string name="mapbox_style_dark" translatable="false">mapbox://styles/mapbox/dark-v9</string>
+    <string name="mapbox_style_mapbox_streets" translatable="false">mapbox://styles/mapbox/streets-v11</string>
+    <string name="mapbox_style_outdoors" translatable="false">mapbox://styles/mapbox/outdoors-v11</string>
+    <string name="mapbox_style_light" translatable="false">mapbox://styles/mapbox/light-v10</string>
+    <string name="mapbox_style_dark" translatable="false">mapbox://styles/mapbox/dark-v10</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>
+    <string name="mapbox_style_satellite_streets" translatable="false">mapbox://styles/mapbox/satellite-streets-v11</string>
     <string name="mapbox_style_traffic_day" translatable="false">mapbox://styles/mapbox/traffic-day-v2</string>
     <string name="mapbox_style_traffic_night" translatable="false">mapbox://styles/mapbox/traffic-night-v2</string>
 </resources>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
index 51442894e1..3da56d1c82 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
@@ -24,7 +24,7 @@
             mapbox:mapbox_cameraTargetLat="38.913187"
             mapbox:mapbox_cameraTargetLng="-77.032546"
             mapbox:mapbox_cameraZoom="12"
-            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" />
+            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v11" />
 
         <!-- SF -->
         <fragment
@@ -36,7 +36,7 @@
             mapbox:mapbox_cameraTargetLat="37.775732"
             mapbox:mapbox_cameraTargetLng="-122.413985"
             mapbox:mapbox_cameraZoom="13"
-            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/outdoors-v10" />
+            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/outdoors-v11" />
     </LinearLayout>
 
     <LinearLayout
@@ -56,7 +56,7 @@
             mapbox:mapbox_cameraTargetLat="12.97913"
             mapbox:mapbox_cameraTargetLng="77.59188"
             mapbox:mapbox_cameraZoom="14"
-            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/light-v9" />
+            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/light-v10" />
 
         <!-- Ayacucho -->
         <fragment
@@ -68,6 +68,6 @@
             mapbox:mapbox_cameraTargetLat="-13.155980"
             mapbox:mapbox_cameraTargetLng="-74.217134"
             mapbox:mapbox_cameraZoom="15"
-            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/dark-v9" />
+            mapbox:mapbox_styleUrl="mapbox://styles/mapbox/dark-v10" />
     </LinearLayout>
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
index b8ea3d847e..9e5312f067 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
@@ -12,6 +12,6 @@
         mapbox:mapbox_cameraTargetLat="47.6077"
         mapbox:mapbox_cameraTargetLng="-122.3421"
         mapbox:mapbox_cameraZoom="11"
-        mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v10" />
+        mapbox:mapbox_styleUrl="mapbox://styles/mapbox/streets-v11" />
 
 </LinearLayout>
-- 
cgit v1.2.1