1 files changed, 103 insertions, 91 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
index 740efd5536..4bc30157f8 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.java
@@ -20,104 +20,116 @@ import com.mapbox.mapboxsdk.testapp.R;
 
 public class ManualZoomActivity extends AppCompatActivity {
 
-    private MapboxMap mapboxMap;
-    private MapView mapView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_manual_zoom);
-
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setDisplayShowHomeEnabled(true);
-        }
-
-        mapView = (MapView) findViewById(R.id.mapView);
-        mapView.setStyleUrl(Style.SATELLITE);
-        mapView.onCreate(savedInstanceState);
-        mapView.getMapAsync(new OnMapReadyCallback() {
-            @Override
-            public void onMapReady(@NonNull final MapboxMap mapboxMap) {
-                ManualZoomActivity.this.mapboxMap = mapboxMap;
-
-                UiSettings uiSettings = ManualZoomActivity.this.mapboxMap.getUiSettings();
-                uiSettings.setAllGesturesEnabled(false);
-            }
-        });
-    }
+  private MapboxMap mapboxMap;
+  private MapView mapView;
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_zoom, menu);
-        return true;
-    }
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_manual_zoom);
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-
-            case R.id.action_zoom_in:
-                mapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
-                return true;
-
-            case R.id.action_zoom_out:
-                mapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
-                return true;
-
-            case R.id.action_zoom_by:
-                mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2));
-                return true;
-            case R.id.action_zoom_to:
-                mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(2));
-                return true;
-
-            case R.id.action_zoom_to_point:
-                View view = getWindow().getDecorView();
-                mapboxMap.animateCamera(
-                    CameraUpdateFactory.zoomBy(1, new Point(view.getMeasuredWidth() / 4, view.getMeasuredHeight() / 4)));
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
+    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        mapView.onResume();
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setDisplayHomeAsUpEnabled(true);
+      actionBar.setDisplayShowHomeEnabled(true);
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        mapView.onPause();
-    }
+    mapView = (MapView) findViewById(R.id.mapView);
+    mapView.setStyleUrl(Style.SATELLITE);
+    mapView.onCreate(savedInstanceState);
+    mapView.getMapAsync(new OnMapReadyCallback() {
+      @Override
+      public void onMapReady(@NonNull final MapboxMap mapboxMap) {
+        ManualZoomActivity.this.mapboxMap = mapboxMap;
+
+        UiSettings uiSettings = ManualZoomActivity.this.mapboxMap.getUiSettings();
+        uiSettings.setAllGesturesEnabled(false);
+      }
+    });
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.menu_zoom, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+
+      case android.R.id.home:
+        onBackPressed();
+        return true;
 
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        mapView.onSaveInstanceState(outState);
-    }
+      case R.id.action_zoom_in:
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomIn());
+        return true;
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mapView.onDestroy();
-    }
+      case R.id.action_zoom_out:
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomOut());
+        return true;
+
+      case R.id.action_zoom_by:
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomBy(2));
+        return true;
+      case R.id.action_zoom_to:
+        mapboxMap.animateCamera(CameraUpdateFactory.zoomTo(2));
+        return true;
+
+      case R.id.action_zoom_to_point:
+        View view = getWindow().getDecorView();
+        mapboxMap.animateCamera(
+          CameraUpdateFactory.zoomBy(1, new Point(view.getMeasuredWidth() / 4, view.getMeasuredHeight() / 4)));
+        return true;
 
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        mapView.onLowMemory();
+      default:
+        return super.onOptionsItemSelected(item);
     }
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    mapView.onStart();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    mapView.onResume();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    mapView.onPause();
+  }
+
+  @Override
+  protected void onStop() {
+    super.onStop();
+    mapView.onStop();
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    super.onSaveInstanceState(outState);
+    mapView.onSaveInstanceState(outState);
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    mapView.onDestroy();
+  }
+
+  @Override
+  public void onLowMemory() {
+    super.onLowMemory();
+    mapView.onLowMemory();
+  }
 }