[android] - zoom to at least 2 when tracking is enabled (#7795)

* [android] - zoom to at least 2 when tracking is enabled, introduce interface for zoom invalidation, simplify example

* fixup unit test, added test for new interface + focal point interface

1 files changed, 4 insertions, 97 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
index 3d08399abf..38769ecc5c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
@@ -1,15 +1,7 @@
 package com.mapbox.mapboxsdk.testapp.activity.userlocation;
 
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.location.Location;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -21,11 +13,8 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.Toast;
 
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.constants.MyBearingTracking;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
-import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
@@ -33,20 +22,19 @@ import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
 
-public class MyLocationTrackingModeActivity extends AppCompatActivity
-  implements MapboxMap.OnMyLocationChangeListener, AdapterView.OnItemSelectedListener {
+public class MyLocationTrackingModeActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
 
   public static final int TRACKING_NONE_INDEX = 0;
   public static final int TRACKING_FOLLOW_INDEX = 1;
   public static final int BEARING_NONE_INDEX = 0;
   public static final int BEARING_GPS_INDEX = 1;
   public static final int BEARING_COMPASS_INDEX = 2;
+
   private MapView mapView;
   private MapboxMap mapboxMap;
   private Spinner locationSpinner;
   private Spinner bearingSpinner;
-  private Location location;
-  private static final int PERMISSIONS_LOCATION = 0;
+
   private MenuItem dismissLocationTrackingOnGestureItem;
   private MenuItem dismissBearingTrackingOnGestureItem;
   private MenuItem enableRotateGesturesItem;
@@ -91,8 +79,6 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity
         bearingSpinner.setOnItemSelectedListener(MyLocationTrackingModeActivity.this);
         setCheckBoxes();
 
-        mapboxMap.setOnMyLocationChangeListener(MyLocationTrackingModeActivity.this);
-
         mapboxMap.setOnMyLocationTrackingModeChangeListener(new MapboxMap.OnMyLocationTrackingModeChangeListener() {
           @Override
           public void onMyLocationTrackingModeChange(@MyLocationTracking.Mode int myLocationTrackingMode) {
@@ -131,91 +117,12 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity
         });
 
         if (savedInstanceState == null) {
-          toggleGps(true);
+          mapboxMap.setMyLocationEnabled(true);
         }
       }
     });
   }
 
-  @UiThread
-  public void toggleGps(boolean enableGps) {
-    if (enableGps) {
-      if ((ContextCompat.checkSelfPermission(this,
-        Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED)
-        || (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
-        != PackageManager.PERMISSION_GRANTED)) {
-        ActivityCompat.requestPermissions(this, new String[] {
-          Manifest.permission.ACCESS_COARSE_LOCATION,
-          Manifest.permission.ACCESS_FINE_LOCATION}, PERMISSIONS_LOCATION);
-      } else {
-        enableLocation(true);
-      }
-    } else {
-      enableLocation(false);
-    }
-  }
-
-  private void enableLocation(boolean enabled) {
-    if (enabled) {
-      mapboxMap.setMyLocationEnabled(true);
-      Location location = mapboxMap.getMyLocation();
-      if (location != null) {
-        setInitialPosition(new LatLng(location));
-      }
-    } else {
-      mapboxMap.setMyLocationEnabled(false);
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    if (requestCode == PERMISSIONS_LOCATION) {
-      if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-        enableLocation(true);
-      }
-    }
-  }
-
-  private void setInitialPosition(LatLng latLng) {
-    mapboxMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
-    mapboxMap.setMyLocationEnabled(true);
-    locationSpinner.setEnabled(true);
-    bearingSpinner.setEnabled(true);
-  }
-
-  @Override
-  public void onMyLocationChange(@Nullable Location location) {
-    if (location != null) {
-      if (this.location == null) {
-        // initial location to reposition map
-        setInitialPosition(new LatLng(location));
-      }
-      this.location = location;
-      showSnackBar();
-    }
-  }
-
-  private void showSnackBar() {
-    String desc = "Loc Chg: ";
-    boolean noInfo = true;
-    if (location.hasSpeed()) {
-      desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Spd = %.1f km/h ", location.getSpeed() * 3.6f);
-      noInfo = false;
-    }
-    if (location.hasAltitude()) {
-      desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Alt = %.0f m ", location.getAltitude());
-      noInfo = false;
-    }
-    if (location.hasAccuracy()) {
-      desc += String.format(MapboxConstants.MAPBOX_LOCALE, "Acc = %.0f m", location.getAccuracy());
-    }
-
-    if (noInfo) {
-      desc += "No extra info";
-    }
-    Snackbar.make(findViewById(android.R.id.content), desc, Snackbar.LENGTH_SHORT).show();
-  }
-
   @Override
   public void onItemSelected(AdapterView<?> parent, View view, int position, long id) throws SecurityException {
     TrackingSettings trackingSettings = mapboxMap.getTrackingSettings();