[android] - deprecate SupportMapFragment, reintegrate MapFragment to use support/androidx fragmentsupstream/tvn-deprecate-supportmapfragment

10 files changed, 25 insertions, 133 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
index 8af9f2c6a8..2c067c733a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -1,10 +1,10 @@
 package com.mapbox.mapboxsdk.maps;
 
-import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index 011a0bdaa2..4abed82b46 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -28,7 +28,9 @@ import java.util.List;
  * </p>
  *
  * @see #getMapAsync(OnMapReadyCallback)
+ * @deprecated Starting with Android Pie, Android SDK fragments are deprecated. Use {@MapFragment} instead.
  */
+@Deprecated
 public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
 
   private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 18fbf33cc8..1bf4864794 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -161,17 +161,6 @@
                 android:value=".activity.FeatureOverviewActivity" />
         </activity>
         <activity
-            android:name=".activity.fragment.SupportMapFragmentActivity"
-            android:description="@string/description_map_fragment_support"
-            android:label="@string/activity_map_fragment_support">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_fragment" />
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity" />
-        </activity>
-        <activity
                 android:name=".activity.fragment.FragmentBackStackActivity"
                 android:description="@string/description_map_fragment_backstack"
                 android:label="@string/activity_map_fragment_backstack"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
index febe17a701..d5e3c40f2c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/FragmentBackStackActivity.kt
@@ -3,9 +3,9 @@ package com.mapbox.mapboxsdk.testapp.activity.fragment
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
+import com.mapbox.mapboxsdk.maps.MapFragment
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.maps.SupportMapFragment
 import com.mapbox.mapboxsdk.testapp.R
 import com.mapbox.mapboxsdk.testapp.utils.NavUtils
 import kotlinx.android.synthetic.main.activity_backstack_fragment.*
@@ -15,13 +15,13 @@ import kotlinx.android.synthetic.main.activity_backstack_fragment.*
  */
 class FragmentBackStackActivity : AppCompatActivity() {
 
-  private lateinit var mapFragment: SupportMapFragment
+  private lateinit var mapFragment: MapFragment
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_backstack_fragment)
 
-    mapFragment = SupportMapFragment.newInstance()
+    mapFragment = MapFragment.newInstance()
     mapFragment.getMapAsync { initMap(it) }
 
     supportFragmentManager.beginTransaction().apply {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
index c7f530b123..d08488405d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/MapFragmentActivity.java
@@ -36,12 +36,12 @@ public class MapFragmentActivity extends AppCompatActivity implements MapFragmen
     MapFragment mapFragment;
     if (savedInstanceState == null) {
       mapFragment = MapFragment.newInstance(createFragmentOptions());
-      getFragmentManager()
+      getSupportFragmentManager()
         .beginTransaction()
         .add(R.id.fragment_container, mapFragment, TAG)
         .commit();
     } else {
-      mapFragment = (MapFragment) getFragmentManager().findFragmentByTag(TAG);
+      mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(TAG);
     }
     mapFragment.getMapAsync(this);
   }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
index f8f53f9ffd..0d9b989633 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/NestedViewPagerActivity.kt
@@ -15,10 +15,9 @@ import android.view.ViewGroup
 import android.widget.TextView
 import com.mapbox.mapboxsdk.camera.CameraPosition
 import com.mapbox.mapboxsdk.geometry.LatLng
+import com.mapbox.mapboxsdk.maps.MapFragment
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
 import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.maps.SupportMapFragment
 import com.mapbox.mapboxsdk.testapp.R
 import kotlinx.android.synthetic.main.activity_recyclerview.*
 
@@ -115,7 +114,7 @@ class NestedViewPagerActivity : AppCompatActivity() {
                 when (position) {
                     0 -> {
                         options.camera(CameraPosition.Builder().target(LatLng(34.920526, 102.634774)).zoom(3.0).build())
-                        val fragment = SupportMapFragment.newInstance(options)
+                        val fragment = MapFragment.newInstance(options)
                         fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.MAPBOX_STREETS) }
                         return fragment
                     }
@@ -124,7 +123,7 @@ class NestedViewPagerActivity : AppCompatActivity() {
                     }
                     2 -> {
                         options.camera(CameraPosition.Builder().target(LatLng(62.326440, 92.764913)).zoom(3.0).build())
-                        val fragment = SupportMapFragment.newInstance(options)
+                        val fragment = MapFragment.newInstance(options)
                         fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.DARK) }
                         return fragment                    }
                     3 -> {
@@ -132,7 +131,7 @@ class NestedViewPagerActivity : AppCompatActivity() {
                     }
                     4 -> {
                         options.camera(CameraPosition.Builder().target(LatLng(-25.007786, 133.623852)).zoom(3.0).build())
-                        val fragment = SupportMapFragment.newInstance(options)
+                        val fragment = MapFragment.newInstance(options)
                         fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) }
                         return fragment                    }
                     5 -> {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
deleted file mode 100644
index 7fd84bcd25..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapFragment;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.maps.SupportMapFragment;
-import com.mapbox.mapboxsdk.testapp.R;
-
-/**
- * Test activity showcasing using the MapFragment API using Support Library Fragments.
- * <p>
- * Uses MapboxMapOptions to initialise the Fragment.
- * </p>
- */
-public class SupportMapFragmentActivity extends AppCompatActivity implements MapFragment.OnMapViewReadyCallback,
-  OnMapReadyCallback, MapView.OnDidFinishRenderingFrameListener {
-
-  private static final String TAG = "com.mapbox.map";
-  private MapboxMap mapboxMap;
-  private MapView mapView;
-  private boolean initialCameraAnimation = true;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_map_fragment);
-    SupportMapFragment mapFragment;
-    if (savedInstanceState == null) {
-      mapFragment = SupportMapFragment.newInstance(createFragmentOptions());
-      getSupportFragmentManager()
-        .beginTransaction()
-        .add(R.id.fragment_container, mapFragment, TAG)
-        .commit();
-    } else {
-      mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentByTag(TAG);
-    }
-    mapFragment.getMapAsync(this);
-
-  }
-
-  private MapboxMapOptions createFragmentOptions() {
-    MapboxMapOptions options = new MapboxMapOptions();
-
-    options.scrollGesturesEnabled(false);
-    options.zoomGesturesEnabled(false);
-    options.tiltGesturesEnabled(false);
-    options.rotateGesturesEnabled(false);
-    options.debugActive(false);
-
-    LatLng dc = new LatLng(38.90252, -77.02291);
-
-    options.minZoomPreference(9);
-    options.maxZoomPreference(11);
-    options.camera(new CameraPosition.Builder()
-      .target(dc)
-      .zoom(11)
-      .build());
-    return options;
-  }
-
-  @Override
-  public void onMapViewReady(MapView map) {
-    mapView = map;
-    mapView.addOnDidFinishRenderingFrameListener(this);
-  }
-
-  @Override
-  public void onMapReady(@NonNull MapboxMap map) {
-    mapboxMap = map;
-    mapboxMap.setStyle(Style.SATELLITE);
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    mapView.removeOnDidFinishRenderingFrameListener(this);
-  }
-
-  @Override
-  public void onDidFinishRenderingFrame(boolean fully) {
-    if (initialCameraAnimation && fully && mapboxMap != null) {
-      mapboxMap.animateCamera(
-        CameraUpdateFactory.newCameraPosition(new CameraPosition.Builder().tilt(45.0).build()), 5000);
-      initialCameraAnimation = false;
-    }
-  }
-}
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
index 77e2e1370d..c2c325e56f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/ViewPagerActivity.kt
@@ -7,9 +7,9 @@ import android.support.v4.app.FragmentStatePagerAdapter
 import android.support.v7.app.AppCompatActivity
 import com.mapbox.mapboxsdk.camera.CameraPosition
 import com.mapbox.mapboxsdk.geometry.LatLng
+import com.mapbox.mapboxsdk.maps.MapFragment
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions
 import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.maps.SupportMapFragment
 import com.mapbox.mapboxsdk.testapp.R
 import kotlinx.android.synthetic.main.activity_viewpager.*
 
@@ -28,30 +28,30 @@ class ViewPagerActivity : AppCompatActivity() {
     super.onRestoreInstanceState(savedInstanceState)
 
     val currentPosition = viewPager.currentItem
-    var mapFragment: SupportMapFragment
+    var mapFragment: MapFragment
 
     if (Math.abs(0 - currentPosition) <= 1) {
-      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 0) as SupportMapFragment
+      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 0) as MapFragment
       mapFragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.MAPBOX_STREETS) }
     }
 
     if (Math.abs(1 - currentPosition) <= 1) {
-      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 1) as SupportMapFragment
+      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 1) as MapFragment
       mapFragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.DARK) }
     }
 
     if (Math.abs(2 - currentPosition) <= 1) {
-      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 2) as SupportMapFragment
+      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 2) as MapFragment
       mapFragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) }
     }
 
     if (Math.abs(3 - currentPosition) <= 1) {
-      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 3) as SupportMapFragment
+      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 3) as MapFragment
       mapFragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) }
     }
 
     if (Math.abs(4 - currentPosition) <= 1) {
-      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 4) as SupportMapFragment
+      mapFragment = viewPager.adapter?.instantiateItem(viewPager, 4) as MapFragment
       mapFragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) }
     }
   }
@@ -63,34 +63,34 @@ class ViewPagerActivity : AppCompatActivity() {
     }
 
     override fun getItem(position: Int): Fragment? {
-      var fragment: SupportMapFragment? = null
+      var fragment: MapFragment? = null
       val options = MapboxMapOptions()
       options.textureMode(true)
 
       when (position) {
         0 -> {
           options.camera(CameraPosition.Builder().target(LatLng(34.920526, 102.634774)).zoom(3.0).build())
-          fragment = SupportMapFragment.newInstance(options)
+          fragment = MapFragment.newInstance(options)
           fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.MAPBOX_STREETS) }
         }
         1 -> {
           options.camera(CameraPosition.Builder().target(LatLng(62.326440, 92.764913)).zoom(3.0).build())
-          fragment = SupportMapFragment.newInstance(options)
+          fragment = MapFragment.newInstance(options)
           fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.DARK) }
         }
         2 -> {
           options.camera(CameraPosition.Builder().target(LatLng(-25.007786, 133.623852)).zoom(3.0).build())
-          fragment = SupportMapFragment.newInstance(options)
+          fragment = MapFragment.newInstance(options)
           fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.SATELLITE) }
         }
         3 -> {
           options.camera(CameraPosition.Builder().target(LatLng(62.326440, 92.764913)).zoom(3.0).build())
-          fragment = SupportMapFragment.newInstance(options)
+          fragment = MapFragment.newInstance(options)
           fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.LIGHT) }
         }
         4 -> {
           options.camera(CameraPosition.Builder().target(LatLng(34.920526, 102.634774)).zoom(3.0).build())
-          fragment = SupportMapFragment.newInstance(options)
+          fragment = MapFragment.newInstance(options)
           fragment.getMapAsync { mapboxMap -> mapboxMap.setStyle(Style.TRAFFIC_NIGHT) }
         }
       }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
index be8dae57a0..876645d110 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
@@ -4,7 +4,6 @@
     <string name="description_info_window_adapter">Learn how to create a custom InfoWindow</string>
     <string name="description_cameraposition">CameraPosition capabilities</string>
     <string name="description_map_fragment">Showcase MapFragment</string>
-    <string name="description_map_fragment_support">Showcase SupportMapFragment</string>
     <string name="description_map_fragment_backstack">Showcase using a Map Fragment with a fragment backstack</string>
     <string name="description_multimap">Activity with multiple maps on screen</string>
     <string name="description_press_for_marker">Add marker to map on long press</string>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
index 027198c71b..e14d8aa12f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="activity_map_fragment_support">Support Map Fragment</string>
     <string name="activity_map_fragment">Map Fragment</string>
     <string name="activity_map_fragment_backstack">Backstack Map Fragment</string>
     <string name="activity_multimap">Multiple Maps on Screen</string>