diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-31 13:17:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-31 13:17:56 +0100 |
commit | ccc3964270e32145b050d97bf4c678941a5c6092 (patch) | |
tree | 7c917036dbe4c542d5bd42a6e997dcec78d6f8e7 /platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera | |
parent | 38ee3408c224194054f7e4941a22dfd8b65f0d6f (diff) | |
download | qtlocation-mapboxgl-ccc3964270e32145b050d97bf4c678941a5c6092.tar.gz |
Android Nougat compatibility: onstart/onstop on MapView (#6830)
* introduce onstart/onstop on MapView
* update wear module
* update fragments
* update changeling
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera')
6 files changed, 86 insertions, 14 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java index 91f2a2d69b..244759713e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimationTypeActivity.java @@ -160,18 +160,30 @@ public class CameraAnimationTypeActivity extends AppCompatActivity implements On } @Override - public void onResume() { + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onResume() { super.onResume(); mapView.onResume(); } @Override - public void onPause() { + 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); 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 925244b4a4..eb289d7d4b 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 @@ -99,18 +99,30 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe } @Override - public void onPause() { - super.onPause(); - mapView.onPause(); + protected void onStart() { + super.onStart(); + mapView.onStart(); } @Override - public void onResume() { + 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 onDestroy() { super.onDestroy(); mapView.onDestroy(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java index 311991d0d1..ed5f761ab4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java @@ -89,18 +89,30 @@ public class LatLngBoundsActivity extends AppCompatActivity implements OnMapRead } @Override - public void onResume() { + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onResume() { super.onResume(); mapView.onResume(); } @Override - public void onPause() { + 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); 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..38186b0318 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 @@ -92,18 +92,30 @@ public class ManualZoomActivity extends AppCompatActivity { } @Override - public void onResume() { + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onResume() { super.onResume(); mapView.onResume(); } @Override - public void onPause() { + 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); 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 9fcdfa3880..ca72db598a 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 @@ -54,18 +54,30 @@ public class MaxMinZoomActivity extends AppCompatActivity implements OnMapReadyC } @Override - public void onResume() { + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onResume() { super.onResume(); mapView.onResume(); } @Override - public void onPause() { + 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); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java index e3dc849ce0..6466537e39 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.java @@ -78,18 +78,30 @@ public class ScrollByActivity extends AppCompatActivity implements OnMapReadyCal } @Override - public void onResume() { + protected void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override + protected void onResume() { super.onResume(); mapView.onResume(); } @Override - public void onPause() { + 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); |