[android] - move strings resources to dedicated files, fixup simple map activity, fixup double map activity, snapshot activity home button click fix, add activity titles, remove obsolete navigation drawer activity

24 files changed, 295 insertions, 588 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 5dcbd268ae..cefe26b6e5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -362,6 +362,9 @@
             <meta-data
                 android:name="@string/category"
                 android:value="@string/category_imagegenerator"/>
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
             android:name=".activity.maplayout.DoubleMapActivity"
@@ -397,18 +400,6 @@
                 android:value=".activity.FeatureOverviewActivity"/>
         </activity>
         <activity
-            android:name=".activity.maplayout.NavigationDrawerActivity"
-            android:description="@string/description_navigation_drawer"
-            android:label="@string/activity_navigation_drawer"
-            android:theme="@style/AppTheme.ActionBar.Transparent">
-            <meta-data
-                android:name="@string/category"
-                android:value="@string/category_maplayout"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activity.FeatureOverviewActivity"/>
-        </activity>
-        <activity
             android:name=".activity.maplayout.SimpleMapActivity"
             android:description="@string/description_simple_map"
             android:label="@string/activity_simple_map">
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
index a8a5054eaf..848eab9a3c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewsInRectangleActivity.java
@@ -19,6 +19,9 @@ import java.util.List;
 
 import timber.log.Timber;
 
+/**
+ * Test activity showcasing counting MarkerViews in a rectangle.
+ */
 public class MarkerViewsInRectangleActivity extends AppCompatActivity implements OnMapReadyCallback,
   View.OnClickListener {
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
index 9498550f52..2820bdbd53 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
@@ -25,6 +25,9 @@ import com.mapbox.mapboxsdk.testapp.R;
 
 import timber.log.Timber;
 
+/**
+ * Test activity showcasing how to listen to camera change events.
+ */
 public class CameraPositionActivity extends AppCompatActivity implements OnMapReadyCallback {
 
   private MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
index 014743df96..53a5800f26 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.java
@@ -13,6 +13,9 @@ import com.mapbox.mapboxsdk.testapp.R;
 
 import timber.log.Timber;
 
+/**
+ * Test activity showcasing using maximum and minimum zoom levels to restrict camera movement.
+ */
 public class MaxMinZoomActivity extends AppCompatActivity implements OnMapReadyCallback {
 
   private MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
index 7026a797d5..22347f8a92 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/InfoWindowAdapterActivity.java
@@ -18,6 +18,9 @@ import com.mapbox.mapboxsdk.testapp.model.annotations.CityStateMarker;
 import com.mapbox.mapboxsdk.testapp.model.annotations.CityStateMarkerOptions;
 import com.mapbox.mapboxsdk.testapp.utils.IconUtils;
 
+/**
+ * Test activity showcasing using an InfoWindowAdapter to provide a custom InfoWindow content.
+ */
 public class InfoWindowAdapterActivity extends AppCompatActivity {
 
   private MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
index 1f016e430b..2c83f6d908 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/BottomSheetActivity.java
@@ -26,6 +26,9 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
 
+/**
+ * Test activity showcasing using a bottomView with a MapView and stacking map fragments below.
+ */
 public class BottomSheetActivity extends AppCompatActivity {
 
   private static final String TAG_MAIN_FRAGMENT = "com.mapbox.mapboxsdk.fragment.tag.main";
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
index 2c84bf6531..ec7df65d59 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -32,7 +32,7 @@ import timber.log.Timber;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
 
 /**
- * Test Activity showcasing the different debug modes and allows to cycle between the default map styles.
+ * Test activity showcasing the different debug modes and allows to cycle between the default map styles.
  */
 public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCallback {
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
index 7ec9cb9242..e1474b86d5 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java
@@ -8,7 +8,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -23,6 +22,12 @@ import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
+/**
+ * Test activity showcasing having 2 maps on top of each other.
+ * <p>
+ * The small map is using the `mapbox_enableZMediaOverlay="true"` configuration
+ * </p>
+ */
 public class DoubleMapActivity extends AppCompatActivity {
 
   private static final String TAG_FRAGMENT = "map";
@@ -45,11 +50,11 @@ public class DoubleMapActivity extends AppCompatActivity {
   public void setMapboxMap(MapboxMap map) {
     // we need to set mapboxmap on the parent activity,
     // for auto-generated ui tests
-
     mapboxMap = map;
     mapboxMap.setStyleUrl(Style.DARK);
     mapboxMap.moveCamera(CameraUpdateFactory.zoomTo(18));
     try {
+      mapboxMap.setMyLocationEnabled(true);
       TrackingSettings settings = mapboxMap.getTrackingSettings();
       settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
     } catch (SecurityException securityException) {
@@ -58,6 +63,9 @@ public class DoubleMapActivity extends AppCompatActivity {
     }
   }
 
+  /**
+   * Custom fragment containing 2 MapViews.
+   */
   public static class DoubleMapFragment extends Fragment {
 
     private DoubleMapActivity activity;
@@ -107,6 +115,7 @@ public class DoubleMapActivity extends AppCompatActivity {
           uiSettings.setLogoEnabled(false);
 
           try {
+            mapboxMap.setMyLocationEnabled(true);
             TrackingSettings settings = mapboxMap.getTrackingSettings();
             settings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
           } catch (SecurityException securityException) {
@@ -123,9 +132,6 @@ public class DoubleMapActivity extends AppCompatActivity {
           });
         }
       });
-
-      SurfaceView surfaceViewMini = (SurfaceView) mapViewMini.findViewById(R.id.surfaceView);
-      surfaceViewMini.setZOrderMediaOverlay(true);
     }
 
     @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
index 9ac87deb0d..24a167e260 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LatLngBoundsForCameraActivity.java
@@ -16,7 +16,7 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
 /**
- * Test Activity showcasing restricting user gestures to a bounds around Iceland.
+ * Test activity showcasing restricting user gestures to a bounds around Iceland.
  */
 public class LatLngBoundsForCameraActivity extends AppCompatActivity implements OnMapReadyCallback {
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/NavigationDrawerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/NavigationDrawerActivity.java
deleted file mode 100644
index 888482b219..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/NavigationDrawerActivity.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.maplayout;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.constants.Style;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.MapFragment;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.testapp.R;
-
-public class NavigationDrawerActivity extends AppCompatActivity {
-
-  private boolean firstStyle = true;
-  private MapboxMap mapboxMap;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_navigation_drawer);
-
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-
-    NavigationDrawerFragment navigationDrawerFragment;
-
-    getFragmentManager()
-      .beginTransaction()
-      .add(R.id.navigation_drawer, navigationDrawerFragment = new NavigationDrawerFragment())
-      .commit();
-
-    navigationDrawerFragment.setUp(this,
-      R.id.navigation_drawer,
-      (DrawerLayout) findViewById(R.id.drawer_layout),
-      getSupportActionBar());
-  }
-
-  public void onNavigationDrawerItemSelected(int position) {
-    // update the main content by replacing fragments
-    switch (position) {
-      case 0:
-        // options
-        MapboxMapOptions options = new MapboxMapOptions();
-        options.styleUrl(firstStyle ? Style.LIGHT : Style.SATELLITE);
-        options.camera(new CameraPosition.Builder()
-          .target(new LatLng(39.913271, 116.413891))
-          .zoom(12)
-          .build());
-
-        // fragment
-        MapFragment mapFragment = MapFragment.newInstance(options);
-        FragmentManager fragmentManager = getFragmentManager();
-        fragmentManager.beginTransaction()
-          .replace(R.id.container, mapFragment)
-          .commit();
-
-        // get callback when map is ready
-        mapFragment.getMapAsync(new OnMapReadyCallback() {
-          @Override
-          public void onMapReady(MapboxMap map) {
-            mapboxMap = map;
-          }
-        });
-
-        firstStyle = !firstStyle;
-        break;
-      case 1:
-        Snackbar.make(
-          findViewById(android.R.id.content),
-          "Hello from snackbar",
-          Snackbar.LENGTH_LONG)
-          .show();
-        break;
-    }
-  }
-
-  public static class NavigationDrawerFragment extends Fragment {
-
-    private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
-    private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned";
-
-    private ActionBarDrawerToggle drawerToggle;
-
-    private DrawerLayout drawerLayout;
-    private ListView drawerListView;
-    private View fragmentContainerView;
-
-    private int currentSelectedPosition = 0;
-    private boolean fromSavedInstanceState;
-    private boolean userLearnedDrawer;
-
-    public NavigationDrawerFragment() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-      super.onCreate(savedInstanceState);
-      SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
-      userLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false);
-
-      if (savedInstanceState != null) {
-        currentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
-        fromSavedInstanceState = true;
-      }
-      selectItem(currentSelectedPosition);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-      super.onActivityCreated(savedInstanceState);
-      setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-      drawerListView = (ListView) inflater.inflate(
-        R.layout.drawer_navigation_drawer, container, false);
-      drawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-          selectItem(position);
-        }
-      });
-      drawerListView.setAdapter(new ArrayAdapter<>(
-        inflater.getContext(),
-        android.R.layout.simple_list_item_activated_1,
-        android.R.id.text1,
-        new String[] {
-          "Different style",
-          "Show snackbar"
-        }));
-      drawerListView.setItemChecked(currentSelectedPosition, true);
-      return drawerListView;
-    }
-
-    /**
-     * Users of this fragment must call this method to set up the navigation drawer interactions.
-     *
-     * @param fragmentId   The android:id of this fragment in its activity's layout.
-     * @param drawerLayout The DrawerLayout containing this fragment's UI.
-     */
-    public void setUp(Activity activity, int fragmentId, DrawerLayout drawerLayout, ActionBar actionBar) {
-      fragmentContainerView = activity.findViewById(fragmentId);
-      this.drawerLayout = drawerLayout;
-      // drawerLayout.setScrimColor(Color.TRANSPARENT);
-
-      actionBar.setDisplayHomeAsUpEnabled(true);
-      actionBar.setHomeButtonEnabled(true);
-
-      drawerToggle = new ActionBarDrawerToggle(
-        activity,
-        NavigationDrawerFragment.this.drawerLayout,
-        R.string.navigation_drawer_open,
-        R.string.navigation_drawer_close
-      ) {
-        @Override
-        public void onDrawerClosed(View drawerView) {
-          super.onDrawerClosed(drawerView);
-          if (!isAdded()) {
-            return;
-          }
-          getActivity().invalidateOptionsMenu();
-        }
-
-        @Override
-        public void onDrawerOpened(View drawerView) {
-          super.onDrawerOpened(drawerView);
-          if (!isAdded()) {
-            return;
-          }
-
-          if (!userLearnedDrawer) {
-            userLearnedDrawer = true;
-            SharedPreferences sp = PreferenceManager
-              .getDefaultSharedPreferences(getActivity());
-            sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply();
-          }
-          getActivity().invalidateOptionsMenu();
-        }
-      };
-
-      if (!userLearnedDrawer && !fromSavedInstanceState) {
-        this.drawerLayout.openDrawer(fragmentContainerView);
-      }
-      this.drawerLayout.post(new Runnable() {
-        @Override
-        public void run() {
-          drawerToggle.syncState();
-        }
-      });
-      this.drawerLayout.setDrawerListener(drawerToggle);
-    }
-
-    private void selectItem(int position) {
-      currentSelectedPosition = position;
-      if (drawerListView != null) {
-        drawerListView.setItemChecked(position, true);
-      }
-      if (drawerLayout != null) {
-        drawerLayout.closeDrawer(fragmentContainerView);
-      }
-
-      Activity activity = getActivity();
-      if (activity != null && activity instanceof NavigationDrawerActivity) {
-        NavigationDrawerActivity navActivity = (NavigationDrawerActivity) activity;
-        navActivity.onNavigationDrawerItemSelected(position);
-      }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-      super.onSaveInstanceState(outState);
-      outState.putInt(STATE_SELECTED_POSITION, currentSelectedPosition);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-      super.onConfigurationChanged(newConfig);
-      drawerToggle.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-      if (drawerToggle.onOptionsItemSelected(item)) {
-        return true;
-      }
-      return super.onOptionsItemSelected(item);
-    }
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
index badb6718cf..8f8a5af3cc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SimpleMapActivity.java
@@ -1,18 +1,11 @@
 package com.mapbox.mapboxsdk.testapp.activity.maplayout;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 
-import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Projection;
 import com.mapbox.mapboxsdk.testapp.R;
 
-import timber.log.Timber;
-
 /**
  * Test activity showcasing a simple MapView without any MapboxMap interaction.
  */
@@ -27,19 +20,6 @@ public class SimpleMapActivity extends AppCompatActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(MapboxMap mapboxMap) {
-        final Projection projection = mapboxMap.getProjection();
-
-        mapboxMap.setOnMapClickListener(new MapboxMap.OnMapClickListener() {
-          @Override
-          public void onMapClick(@NonNull LatLng point) {
-            Timber.e(projection.getVisibleRegion().toString());
-          }
-        });
-      }
-    });
   }
 
   @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
index 1ff0b0e8e1..24914fcbb2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/FillExtrusionStyleTestActivity.java
@@ -1,6 +1,5 @@
 package com.mapbox.mapboxsdk.testapp.activity.style;
 
-
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
@@ -9,6 +8,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
+/**
+ * Test activity used for instrumentation tests of fill extrusion.
+ */
 public class FillExtrusionStyleTestActivity extends AppCompatActivity {
 
   public MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java
index f41e5e38f0..71b8115d2e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/BaseLocationActivity.java
@@ -14,6 +14,9 @@ import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
 
 import java.util.List;
 
+/**
+ * Base class for location aware activities.
+ */
 public abstract class BaseLocationActivity extends AppCompatActivity implements PermissionsListener {
 
   private PermissionsManager permissionsManager;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
index b0ea9c608b..e954b73f8d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/CustomLocationEngineActivity.java
@@ -12,6 +12,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
 
+/**
+ * Test activity showcasing using a custom location engine.
+ */
 public class CustomLocationEngineActivity extends BaseLocationActivity {
 
   private MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
index d465d676f7..718c10c7cb 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationToggleActivity.java
@@ -11,6 +11,9 @@ import com.mapbox.mapboxsdk.testapp.R;
 
 import timber.log.Timber;
 
+/**
+ * Test activity showcasing toggling the user location on the map.
+ */
 public class MyLocationToggleActivity extends BaseLocationActivity {
 
   private MapView mapView;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
index cfc923902c..26b40b9ab6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
@@ -5,13 +5,13 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-<com.mapbox.mapboxsdk.maps.MapView
-    android:id="@id/mapView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:mapbox_cameraTargetLat="46.437"
-    app:mapbox_cameraTargetLng="-80.425"
-    app:mapbox_cameraZoom="3"
-    app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/>
+    <com.mapbox.mapboxsdk.maps.MapView
+        android:id="@id/mapView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:mapbox_cameraTargetLat="41.9567"
+        app:mapbox_cameraTargetLng="-78.6430"
+        app:mapbox_cameraZoom="5"
+        app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/>
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
index 43fa8fb995..419660b36a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".activity.fragment.MapFragmentActivity">
-
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</LinearLayout>
+    android:layout_height="match_parent"/>
 
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_navigation_drawer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_navigation_drawer.xml
deleted file mode 100644
index 26a71bc568..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_navigation_drawer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.mapbox.mapboxsdk.testapp.activity.maplayout.NavigationDrawerActivity">
-
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="56dp" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/navigation_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true" />
-
-</android.support.v4.widget.DrawerLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
index ecfa1372f6..3cf2fbea55 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                xmlns:maps="http://schemas.android.com/apk/res-auto">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@id/mapView"
@@ -18,6 +19,7 @@
         <com.mapbox.mapboxsdk.maps.MapView
             android:id="@+id/mini_map"
             android:layout_width="100dp"
+            maps:mapbox_enableZMediaOverlay="true"
             android:layout_height="100dp" />
     </FrameLayout>
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
new file mode 100644
index 0000000000..6c17149a96
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
+    <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>
+    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
+    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
+    <string name="menuitem_title_reset">Reset</string>
+    <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
+    <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
+    <string name="menuitem_title_change_location_source_lost">Change to LOST location source</string>
+    <string name="menuitem_title_change_location_source_mock">Change to mock location source</string>
+    <string name="menuitem_title_change_location_source_null">Reset location source to null</string>
+    <string name="button_camera_move">Move</string>
+    <string name="button_camera_ease">Ease</string>
+    <string name="button_camera_animate">Animate</string>
+    <string name="button_user_dot_default">Default</string>
+    <string name="button_user_dot_tint">Tint dot</string>
+    <string name="button_user_accuracy_ring_tint">Tint ring</string>
+    <string name="button_user_transparent_tint">tran</string>
+    <string name="button_open_dialog">Open dialog</string>
+    <string name="button_download_region">Download region</string>
+    <string name="button_list_regions">List regions</string>
+    <string name="action_remove_polylines">Remove polylines</string>
+    <string name="action_visibility_polygon">Change visibility</string>
+    <string name="action_alpha_polygon">Change alpha</string>
+    <string name="action_points_polygon">Change points</string>
+    <string name="action_color_polygon">Change color</string>
+    <string name="action_holes_polygon">Change holes</string>
+    <string name="action_width_polyline">Change width</string>
+    <string name="action_calculate_distance">"Click the map to calculate the distance"</string>
+    <string name="action_scroll_by">Move the map by x/y pixels</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="scrollby_x_value">X: %1$d</string>
+    <string name="scrollby_y_value">Y: %1$d</string>
+    <string name="dialog_camera_position">Animate to new position</string>
+    <string name="dynamic_marker_chelsea_title">Chelsea</string>
+    <string name="dynamic_marker_chelsea_snippet">Stamford Bridge</string>
+    <string name="dynamic_marker_arsenal_title">Arsenal</string>
+    <string name="dynamic_marker_arsenal_snippet">Emirates Stadium</string>
+    <string name="debug_zoom">Zoom: %.2f</string>
+    <string name="viewcache_size">ViewCache size %.2f</string>
+    <string name="latitude">Latitude</string>
+    <string name="min_value">-180</string>
+    <string name="longitude">Longitude</string>
+    <string name="zoom">Zoom</string>
+    <string name="default_zoom_value">18</string>
+    <string name="bearing">Bearing</string>
+    <string name="default_tilt_value">0</string>
+    <string name="tilt">Tilt</string>
+    <string name="no_results">No Results</string>
+    <string name="change_intensity">Change intensity</string>
+    <string name="change_anchor">Change Anchor</string>
+    <string name="amount_of_markers">Amount of markers</string>
+    <string name="update_layer_invalidate">Update layer (invalidate)</string>
+    <string name="red">Red</string>
+    <string name="green">Green</string>
+    <string name="blue">Blue</string>
+    <string name="add_an_exponential_zoom_function">Add an exponential zoom function</string>
+    <string name="add_an_interval_zoom_function">Add an interval zoom function</string>
+    <string name="add_a_categorical_source_function">Add a categorical source function</string>
+    <string name="add_an_exponential_source_function">Add an exponential source function</string>
+    <string name="add_an_identity_source_function">Add an identity source function</string>
+    <string name="add_an_interval_source_function">Add an interval source function</string>
+    <string name="add_a_composite_categorical_function">Add a composite, categorical function</string>
+    <string name="add_a_composite_exponential_function">Add a composite, exponential function</string>
+    <string name="add_a_composite_interval_function">Add a composite, interval function</string>
+    <string name="my_location_tracking">My Location Tracking</string>
+    <string name="bangalore">Bangalore</string>
+    <string name="list_all_layers_in_the_style">List all layers in the style</string>
+    <string name="list_all_sources_in_the_style">List all sources in the style</string>
+    <string name="color_the_water">Color the water</string>
+    <string name="set_background_opacity">Set background opacity</string>
+    <string name="set_road_symbol_placement_to_point">Set road symbol placement to Point</string>
+    <string name="set_layer_visibility_to_false">Set layer visibility to false</string>
+    <string name="add_a_parks_layer">Add a parks layer</string>
+    <string name="add_a_dynamic_geojson_source">Add a dynamic GeoJSON source</string>
+    <string name="remove_buildings_layer">Remove buildings layer</string>
+    <string name="add_a_terrain_layer">Add a terrain layer</string>
+    <string name="add_a_satellite_layer">Add a satellite layer</string>
+    <string name="change_the_water_color_on_zoom">Change the water color on zoom</string>
+    <string name="custom_tiles">Custom tiles</string>
+    <string name="apply_filtered_fill">Apply filtered fill</string>
+    <string name="apply_filtered_line">Apply filtered line</string>
+    <string name="apply_numeric_fill_filter">Apply numeric fill filter</string>
+    <string name="toggle_text_size">Toggle text size</string>
+    <string name="toggle_text_field_contents">Toggle text field contents</string>
+    <string name="toggle_text_font">Toggle text font</string>
+    <string name="zoom_in">Zoom in</string>
+    <string name="zoom_out">Zoom out</string>
+    <string name="zoom_by_2">Zoom by 2</string>
+    <string name="zoom_to_point">Zoom to point</string>
+    <string name="zoom_to_4">Zoom to 4</string>
+</resources>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml
new file mode 100644
index 0000000000..9ade28ae8d
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/categories.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="category">category</string>
+    <string name="category_basic">_Basic</string>
+    <string name="category_annotation">Annotation</string>
+    <string name="category_camera">Camera</string>
+    <string name="category_custom_layer">Custom Layer</string>
+    <string name="category_fragment">Fragment</string>
+    <string name="category_imagegenerator">Image Generator</string>
+    <string name="category_infowindow">Info Window</string>
+    <string name="category_maplayout">Map Layout</string>
+    <string name="category_offline">Offline</string>
+    <string name="category_userlocation">User Location</string>
+    <string name="category_style">Styling</string>
+    <string name="category_features">Features</string>
+    <string name="category_storage">Storage</string>
+</resources>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
new file mode 100644
index 0000000000..976d2c0025
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="description_user_location_tracking">Tracks the location of the user</string>
+    <string name="description_user_location_customization">Customize the location of the user</string>
+    <string name="description_user_location_dot_color">Customize the user location color</string>
+    <string name="description_user_location_toggle">Toggle location of the user on and off</string>
+    <string name="description_custom_location_engine">Customize location engine</string>
+    <string name="description_custom_layer">Overlay a custom native layer on the map</string>
+    <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_multimap">Activity with multiple maps on screen</string>
+    <string name="description_press_for_marker">Add marker to map on long press</string>
+    <string name="description_camera_zoom">Different types of zoom methods</string>
+    <string name="description_minmax_zoom">Configure a max and min zoomlevel</string>
+    <string name="description_info_window">Learn how to handle the InfoWindow</string>
+    <string name="description_add_bulk_markers">Add Markers In Bulk to a Map</string>
+    <string name="description_camera_animation_types">Showcase the different animation types</string>
+    <string name="description_visible_bounds">Center the camera around a bounds</string>
+    <string name="description_dynamic_marker">Update position and icon</string>
+    <string name="description_map_padding">Map Padding example</string>
+    <string name="description_debug_mode">Debug Mode</string>
+    <string name="description_offline">Offline Map example</string>
+    <string name="description_update_metadata">Update metadata example</string>
+    <string name="description_offline_region_delete">Delete region example</string>
+    <string name="description_animated_marker">Animate the position change of a marker</string>
+    <string name="description_polyline">Add a polyline to a map</string>
+    <string name="description_polygon">Add a polygon to a map</string>
+    <string name="description_scroll_by">Scroll with pixels in x,y direction</string>
+    <string name="description_snapshot">Example to make a snapshot of the map</string>
+    <string name="description_doublemap">2 maps in a view hierarchy</string>
+    <string name="description_view_marker">Use an Android SDK View as marker</string>
+    <string name="description_dynamic_info_window_adapter">Learn how to create a dynamic custom InfoWindow</string>
+    <string name="description_viewpager">Use SupportMapFragments in a ViewPager</string>
+    <string name="description_runtime_style">Adopt the map style on the fly</string>
+    <string name="description_data_driven_style">Use functions to change the map appearance</string>
+    <string name="description_symbol_layer">Manipulate symbols at runtime</string>
+    <string name="description_custom_sprite">Use a custom sprite in a Symbol Layer</string>
+    <string name="description_geojson_clustering">Use GeoJson sources and dynamic layers to cluster information</string>
+    <string name="description_geojson_realtime">Use realtime GeoJSON data streams to move a symbol on your map</string>
+    <string name="description_print">Shows how to print a map</string>
+    <string name="description_query_rendered_feature_properties_point">Query rendered feature properties on click</string>
+    <string name="description_query_rendered_features_box_count">Count all rendered features in box</string>
+    <string name="description_query_rendered_features_box_symbol_count">Count all rendered symbols in box</string>
+    <string name="description_query_rendered_features_box_highlight">Hightligh buildings in box</string>
+    <string name="description_query_source_features">Query source for features</string>
+    <string name="description_simple_map">Shows a simple map</string>
+    <string name="description_map_change">Logs map change events to Logcat</string>
+    <string name="description_visibility_map">Changes visibility of map and view parent</string>
+    <string name="description_add_remove_markers">Change Symbol icon when zoom levels changes</string>
+    <string name="description_style_file">Use a local file as the style</string>
+    <string name="description_map_in_dialog">Display a map inside a dialog fragment</string>
+    <string name="description_marker_view_rectangle">Marker Views within a rectangle</string>
+    <string name="description_circle_layer">Show bus stops and route in Singapore</string>
+    <string name="description_url_transform">Transform urls on the fly</string>
+    <string name="description_restricted_bounds">Limit viewport to Iceland</string>
+    <string name="description_fill_extrusion_layer">Shows how to add 3D extruded shapes</string>
+    <string name="description_building_fill_extrusion_layer">Shows how to show 3D extruded buildings</string>
+    <string name="description_animated_image_source">Shows how to animate georeferenced images</string>
+    <string name="description_bottom_sheet">Show 2 MapView on screen with a bottom sheet</string>
+    <string name="description_map_snapshotter">Show a static bitmap taken with the MapSnapshotter</string>
+</resources>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index b1f354aad5..15a916fac9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -1,245 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Mapbox Android SDK TestApp</string>
-
-    <!--Activity-->
-    <string name="activity_map_fragment_suport">Support Map Fragment</string>
-    <string name="activity_map_fragment">Map Fragment</string>
-    <string name="activity_multimap">Multiple Maps on Screen</string>
-    <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
-    <string name="activity_animated_marker">Animated Markers</string>
-    <string name="activity_dynamic_marker">Dynamic Marker</string>
-    <string name="activity_polyline">Polyline</string>
-    <string name="activity_polygon">Polygon</string>
-    <string name="activity_press_for_marker">Press Map For Marker</string>
-    <string name="activity_view_marker">View Marker API</string>
-    <string name="activity_add_remove_markers">Zoom function with SymbolLayer</string>
-    <string name="activity_info_window">Standard InfoWindow</string>
-    <string name="activity_infowindow_adapter">Custom InfoWindow</string>
-    <string name="activity_dynamic_infowindow_adapter">Custom Dynamic InfoWindow</string>
-    <string name="activity_camera_animation_types">Animation Types</string>
-    <string name="activity_camera_zoom">Zoom Methods</string>
-    <string name="activity_visible_coordinate_bounds">LatLngBounds Method</string>
-    <string name="activity_camera_position">CameraPosition Method</string>
-    <string name="activity_scroll_by">Scroll By Method</string>
-    <string name="activity_double_map">Double Map Activity</string>
-    <string name="activity_snapshot">Snapshot Activity</string>
-    <string name="activity_user_tracking_mode">User tracking mode</string>
-    <string name="activity_user_tracking_customization">User location drawable</string>
-    <string name="activity_user_dot_color">User location tint color</string>
-    <string name="activity_user_location_toggle">User location toggle</string>
-    <string name="activity_custom_location_engine">Custom location engine</string>
-    <string name="activity_custom_layer">Custom Layer</string>
-    <string name="activity_map_padding">Map Padding</string>
-    <string name="activity_debug_mode">Debug Mode</string>
-    <string name="activity_offline">Offline Map</string>
-    <string name="activity_update_metadata">Update metadata Map</string>
-    <string name="activity_offline_region_delete">Delete region</string>
-    <string name="activity_minmax_zoom">Min/Max Zoom</string>
-    <string name="activity_viewpager">ViewPager</string>
-    <string name="activity_runtime_style">Runtime Style</string>
-    <string name="activity_data_driven_style">Data Driven Style</string>
-    <string name="activity_circle_layer">Circle layer</string>
-    <string name="activity_style_file">Local Style file</string>
-    <string name="activity_geojson_clustering">GeoJson Clustering</string>
-    <string name="activity_geojson_realtime">Add live realtime data</string>
-    <string name="activity_print">Print a map</string>
-    <string name="activity_query_rendered_feature_properties">Query feature properties</string>
-    <string name="activity_query_rendered_features_box_count">Count features in box</string>
-    <string name="activity_query_rendered_features_box_symbol_count">Count symbols in box</string>
-    <string name="activity_query_rendered_features_box_highlight">Highlight features in box</string>
-    <string name="activity_query_source_features">Query source features</string>
-    <string name="activity_symbol_layer">Symbols</string>
-    <string name="activity_add_sprite">Add Custom Sprite</string>
-    <string name="activity_navigation_drawer">Android SDK View integration</string>
-    <string name="activity_simple_map">Simple Map</string>
-    <string name="activity_map_change">Map Change Events</string>
-    <string name="activity_map_visibility">Visibility Map</string>
-    <string name="activity_map_in_dialog">Dialog with map</string>
-    <string name="activity_marker_view_rectangle">Marker views in rectangle</string>
-    <string name="activity_url_transform">Url transform</string>
-    <string name="activity_restricted_bounds">Restrict camera to a bounds</string>
-    <string name="activity_fill_extrusion_layer">Fill extrusions</string>
-    <string name="activity_building_fill_extrusion_layer">Building layer</string>
-    <string name="activity_animated_image_source">Animated Image Source</string>
-    <string name="activity_bottom_sheet">Bottom sheet</string>
-    <string name="activity_map_snapshotter">Map Snapshotter</string>
-
-    <!--Description-->
-    <string name="description_user_location_tracking">Tracks the location of the user</string>
-    <string name="description_user_location_customization">Customize the location of the user</string>
-    <string name="description_user_location_dot_color">Customize the user location color</string>
-    <string name="description_user_location_toggle">Toggle location of the user on and off</string>
-    <string name="description_custom_location_engine">Customize location engine</string>
-    <string name="description_custom_layer">Overlay a custom native layer on the map</string>
-    <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_multimap">Activity with multiple maps on screen</string>
-    <string name="description_press_for_marker">Add marker to map on long press</string>
-    <string name="description_camera_zoom">Different types of zoom methods</string>
-    <string name="description_minmax_zoom">Configure a max and min zoomlevel</string>
-    <string name="description_info_window">Learn how to handle the InfoWindow</string>
-    <string name="description_add_bulk_markers">Add Markers In Bulk to a Map</string>
-    <string name="description_camera_animation_types">Showcase the different animation types</string>
-    <string name="description_visible_bounds">Center the camera around a bounds</string>
-    <string name="description_dynamic_marker">Update position and icon</string>
-    <string name="description_map_padding">Map Padding example</string>
-    <string name="description_debug_mode">Debug Mode</string>
-    <string name="description_offline">Offline Map example</string>
-    <string name="description_update_metadata">Update metadata example</string>
-    <string name="description_offline_region_delete">Delete region example</string>
-    <string name="description_animated_marker">Animate the position change of a marker</string>
-    <string name="description_polyline">Add a polyline to a map</string>
-    <string name="description_polygon">Add a polygon to a map</string>
-    <string name="description_scroll_by">Scroll with pixels in x,y direction</string>
-    <string name="description_snapshot">Example to make a snapshot of the map</string>
-    <string name="description_doublemap">2 maps in a view hierarchy</string>
-    <string name="description_view_marker">Use an Android SDK View as marker</string>
-    <string name="description_dynamic_info_window_adapter">Learn how to create a dynamic custom InfoWindow</string>
-    <string name="description_viewpager">Use SupportMapFragments in a ViewPager</string>
-    <string name="description_runtime_style">Adopt the map style on the fly</string>
-    <string name="description_data_driven_style">Use functions to change the map appearance</string>
-    <string name="description_symbol_layer">Manipulate symbols at runtime</string>
-    <string name="description_custom_sprite">Use a custom sprite in a Symbol Layer</string>
-    <string name="description_geojson_clustering">Use GeoJson sources and dynamic layers to cluster information</string>
-    <string name="description_geojson_realtime">Use realtime GeoJSON data streams to move a symbol on your map</string>
-    <string name="description_print">Shows how to print a map</string>
-    <string name="description_navigation_drawer">Test animation of Android SDK View components</string>
-    <string name="description_query_rendered_feature_properties_point">Query rendered feature properties on click</string>
-    <string name="description_query_rendered_features_box_count">Count all rendered features in box</string>
-    <string name="description_query_rendered_features_box_symbol_count">Count all rendered symbols in box</string>
-    <string name="description_query_rendered_features_box_highlight">Hightligh buildings in box</string>
-    <string name="description_query_source_features">Query source for features</string>
-    <string name="description_simple_map">Shows a simple map</string>
-    <string name="description_map_change">Logs map change events to Logcat</string>
-    <string name="description_visibility_map">Changes visibility of map and view parent</string>
-    <string name="description_add_remove_markers">Change Symbol icon when zoom levels changes</string>
-    <string name="description_style_file">Use a local file as the style</string>
-    <string name="description_map_in_dialog">Display a map inside a dialog fragment</string>
-    <string name="description_marker_view_rectangle">Marker Views within a rectangle</string>
-    <string name="description_circle_layer">Show bus stops and route in Singapore</string>
-    <string name="description_url_transform">Transform urls on the fly</string>
-    <string name="description_restricted_bounds">Limit viewport to Iceland</string>
-    <string name="description_fill_extrusion_layer">Shows how to add 3D extruded shapes</string>
-    <string name="description_building_fill_extrusion_layer">Shows how to show 3D extruded buildings</string>
-    <string name="description_animated_image_source">Shows how to animate georeferenced images</string>
-    <string name="description_bottom_sheet">Show 2 MapView on screen with a bottom sheet</string>
-    <string name="description_map_snapshotter">Show a static bitmap taken with the MapSnapshotter</string>
-
-    <!--Categories-->
-    <string name="category">category</string>
-    <string name="category_basic">_Basic</string>
-    <string name="category_annotation">Annotation</string>
-    <string name="category_camera">Camera</string>
-    <string name="category_custom_layer">Custom Layer</string>
-    <string name="category_fragment">Fragment</string>
-    <string name="category_imagegenerator">Image Generator</string>
-    <string name="category_infowindow">Info Window</string>
-    <string name="category_maplayout">Map Layout</string>
-    <string name="category_offline">Offline</string>
-    <string name="category_userlocation">User Location</string>
-    <string name="category_style">Styling</string>
-    <string name="category_features">Features</string>
-    <string name="category_storage">Storage</string>
-
-    <!--Actions-->
-    <string name="action_remove_polylines">Remove polylines</string>
-    <string name="action_visibility_polygon">Change visibility</string>
-    <string name="action_alpha_polygon">Change alpha</string>
-    <string name="action_points_polygon">Change points</string>
-    <string name="action_color_polygon">Change color</string>
-    <string name="action_holes_polygon">Change holes</string>
-    <string name="action_width_polyline">Change width</string>
-    <string name="action_calculate_distance">"Click the map to calculate the distance"</string>
-    <string name="action_scroll_by">Move the map by x/y pixels</string>
-
-    <!--Menu-->
-    <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>
-    <string name="menuitem_title_deselect_markers_on_tap">Deselect Markers On Tap</string>
-    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
-    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
-    <string name="menuitem_title_reset">Reset</string>
-    <string name="menuitem_title_rotate_gesture_enabled">Enable rotate gestures</string>
-    <string name="menuitem_title_scroll_gesture_enabled">Enable scroll gestures</string>
-    <string name="menuitem_title_change_location_source_lost">Change to LOST location source</string>
-    <string name="menuitem_title_change_location_source_mock">Change to mock location source</string>
-    <string name="menuitem_title_change_location_source_null">Reset location source to null</string>
-
-    <!--Button-->
-    <string name="button_camera_move">Move</string>
-    <string name="button_camera_ease">Ease</string>
-    <string name="button_camera_animate">Animate</string>
-    <string name="button_user_dot_default">Default</string>
-    <string name="button_user_dot_tint">Tint dot</string>
-    <string name="button_user_accuracy_ring_tint">Tint ring</string>
-    <string name="button_user_transparent_tint">tran</string>
-    <string name="button_open_dialog">Open dialog</string>
-    <string name="button_download_region">Download region</string>
-    <string name="button_list_regions">List regions</string>
-
-    <!--Other-->
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="scrollby_x_value">X: %1$d</string>
-    <string name="scrollby_y_value">Y: %1$d</string>
-    <string name="dialog_camera_position">Animate to new position</string>
-    <string name="dynamic_marker_chelsea_title">Chelsea</string>
-    <string name="dynamic_marker_chelsea_snippet">Stamford Bridge</string>
-    <string name="dynamic_marker_arsenal_title">Arsenal</string>
-    <string name="dynamic_marker_arsenal_snippet">Emirates Stadium</string>
-    <string name="debug_zoom">Zoom: %.2f</string>
-    <string name="viewcache_size">ViewCache size %.2f</string>
-    <string name="latitude">Latitude</string>
-    <string name="min_value">-180</string>
-    <string name="longitude">Longitude</string>
-    <string name="zoom">Zoom</string>
-    <string name="default_zoom_value">18</string>
-    <string name="bearing">Bearing</string>
-    <string name="default_tilt_value">0</string>
-    <string name="tilt">Tilt</string>
-    <string name="no_results">No Results</string>
-    <string name="change_intensity">Change intensity</string>
-    <string name="change_anchor">Change Anchor</string>
-    <string name="amount_of_markers">Amount of markers</string>
-    <string name="update_layer_invalidate">Update layer (invalidate)</string>
-    <string name="red">Red</string>
-    <string name="green">Green</string>
-    <string name="blue">Blue</string>
-    <string name="add_an_exponential_zoom_function">Add an exponential zoom function</string>
-    <string name="add_an_interval_zoom_function">Add an interval zoom function</string>
-    <string name="add_a_categorical_source_function">Add a categorical source function</string>
-    <string name="add_an_exponential_source_function">Add an exponential source function</string>
-    <string name="add_an_identity_source_function">Add an identity source function</string>
-    <string name="add_an_interval_source_function">Add an interval source function</string>
-    <string name="add_a_composite_categorical_function">Add a composite, categorical function</string>
-    <string name="add_a_composite_exponential_function">Add a composite, exponential function</string>
-    <string name="add_a_composite_interval_function">Add a composite, interval function</string>
-    <string name="my_location_tracking">My Location Tracking</string>
-    <string name="bangalore">Bangalore</string>
-    <string name="list_all_layers_in_the_style">List all layers in the style</string>
-    <string name="list_all_sources_in_the_style">List all sources in the style</string>
-    <string name="color_the_water">Color the water</string>
-    <string name="set_background_opacity">Set background opacity</string>
-    <string name="set_road_symbol_placement_to_point">Set road symbol placement to Point</string>
-    <string name="set_layer_visibility_to_false">Set layer visibility to false</string>
-    <string name="add_a_parks_layer">Add a parks layer</string>
-    <string name="add_a_dynamic_geojson_source">Add a dynamic GeoJSON source</string>
-    <string name="remove_buildings_layer">Remove buildings layer</string>
-    <string name="add_a_terrain_layer">Add a terrain layer</string>
-    <string name="add_a_satellite_layer">Add a satellite layer</string>
-    <string name="change_the_water_color_on_zoom">Change the water color on zoom</string>
-    <string name="custom_tiles">Custom tiles</string>
-    <string name="apply_filtered_fill">Apply filtered fill</string>
-    <string name="apply_filtered_line">Apply filtered line</string>
-    <string name="apply_numeric_fill_filter">Apply numeric fill filter</string>
-    <string name="toggle_text_size">Toggle text size</string>
-    <string name="toggle_text_field_contents">Toggle text field contents</string>
-    <string name="toggle_text_font">Toggle text font</string>
-    <string name="zoom_in">Zoom in</string>
-    <string name="zoom_out">Zoom out</string>
-    <string name="zoom_by_2">Zoom by 2</string>
-    <string name="zoom_to_point">Zoom to point</string>
-    <string name="zoom_to_4">Zoom to 4</string>
 </resources>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
new file mode 100644
index 0000000000..da838bf61b
--- /dev/null
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="activity_map_fragment_suport">Support Map Fragment</string>
+    <string name="activity_map_fragment">Map Fragment</string>
+    <string name="activity_multimap">Multiple Maps on Screen</string>
+    <string name="activity_add_bulk_markers">Add Markers In Bulk</string>
+    <string name="activity_animated_marker">Animated Markers</string>
+    <string name="activity_dynamic_marker">Dynamic Marker</string>
+    <string name="activity_polyline">Polyline</string>
+    <string name="activity_polygon">Polygon</string>
+    <string name="activity_press_for_marker">Press Map For Marker</string>
+    <string name="activity_view_marker">View Marker API</string>
+    <string name="activity_add_remove_markers">Zoom function with SymbolLayer</string>
+    <string name="activity_info_window">Standard InfoWindow</string>
+    <string name="activity_infowindow_adapter">Custom InfoWindow</string>
+    <string name="activity_dynamic_infowindow_adapter">Custom Dynamic InfoWindow</string>
+    <string name="activity_camera_animation_types">Animation Types</string>
+    <string name="activity_camera_zoom">Zoom Methods</string>
+    <string name="activity_visible_coordinate_bounds">LatLngBounds Method</string>
+    <string name="activity_camera_position">CameraPosition Method</string>
+    <string name="activity_scroll_by">Scroll By Method</string>
+    <string name="activity_double_map">Double Map Activity</string>
+    <string name="activity_snapshot">Snapshot Activity</string>
+    <string name="activity_user_tracking_mode">User tracking mode</string>
+    <string name="activity_user_tracking_customization">User location drawable</string>
+    <string name="activity_user_dot_color">User location tint color</string>
+    <string name="activity_user_location_toggle">User location toggle</string>
+    <string name="activity_custom_location_engine">Custom location engine</string>
+    <string name="activity_custom_layer">Custom Layer</string>
+    <string name="activity_map_padding">Map Padding</string>
+    <string name="activity_debug_mode">Debug Mode</string>
+    <string name="activity_offline">Offline Map</string>
+    <string name="activity_update_metadata">Update metadata Map</string>
+    <string name="activity_offline_region_delete">Delete region</string>
+    <string name="activity_minmax_zoom">Min/Max Zoom</string>
+    <string name="activity_viewpager">ViewPager</string>
+    <string name="activity_runtime_style">Runtime Style</string>
+    <string name="activity_data_driven_style">Data Driven Style</string>
+    <string name="activity_circle_layer">Circle layer</string>
+    <string name="activity_style_file">Local Style file</string>
+    <string name="activity_geojson_clustering">GeoJson Clustering</string>
+    <string name="activity_geojson_realtime">Add live realtime data</string>
+    <string name="activity_print">Print a map</string>
+    <string name="activity_query_rendered_feature_properties">Query feature properties</string>
+    <string name="activity_query_rendered_features_box_count">Count features in box</string>
+    <string name="activity_query_rendered_features_box_symbol_count">Count symbols in box</string>
+    <string name="activity_query_rendered_features_box_highlight">Highlight features in box</string>
+    <string name="activity_query_source_features">Query source features</string>
+    <string name="activity_symbol_layer">Symbols</string>
+    <string name="activity_add_sprite">Add Custom Sprite</string>
+    <string name="activity_simple_map">Simple Map</string>
+    <string name="activity_map_change">Map Change Events</string>
+    <string name="activity_map_visibility">Visibility Map</string>
+    <string name="activity_map_in_dialog">Dialog with map</string>
+    <string name="activity_marker_view_rectangle">Marker views in rectangle</string>
+    <string name="activity_url_transform">Url transform</string>
+    <string name="activity_restricted_bounds">Restrict camera to a bounds</string>
+    <string name="activity_fill_extrusion_layer">Fill extrusions</string>
+    <string name="activity_building_fill_extrusion_layer">Building layer</string>
+    <string name="activity_animated_image_source">Animated Image Source</string>
+    <string name="activity_bottom_sheet">Bottom sheet</string>
+    <string name="activity_map_snapshotter">Map Snapshotter</string>
+</resources>
\ No newline at end of file