[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

14 files changed, 40 insertions, 280 deletions

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;