summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanswick <dan.swick@gmail.com>2015-12-10 19:27:48 -0800
committerTobrun <tobrun.van.nuland@gmail.com>2015-12-10 21:09:14 -0800
commit09bf5570e18204f8aa83dd802422c5755acd8462 (patch)
tree38132eeee2f3a64a262c64298e31ef535abb40b5
parent9747caa4358ae32e164912cae83aa2378ad97387 (diff)
downloadqtlocation-mapboxgl-09bf5570e18204f8aa83dd802422c5755acd8462.tar.gz
updates order of lifecycle methods. Addresses #2957
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
index 17af8fe2db..3256529763 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java
@@ -229,11 +229,12 @@ public class MainActivity extends AppCompatActivity {
mMapView.onStart();
}
+ // Called when our app comes into the foreground
@Override
- protected void onStop() {
- super.onStop();
+ public void onResume() {
+ super.onResume();
- mMapView.onStop();
+ mMapView.onResume();
}
// Called when our app goes into the background
@@ -244,12 +245,11 @@ public class MainActivity extends AppCompatActivity {
mMapView.onPause();
}
- // Called when our app comes into the foreground
@Override
- public void onResume() {
- super.onResume();
+ protected void onStop() {
+ super.onStop();
- mMapView.onResume();
+ mMapView.onStop();
}
@Override