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/maplayout | |
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/maplayout')
5 files changed, 68 insertions, 8 deletions
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 377d5d18f0..d80a68f68d 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 @@ -87,18 +87,30 @@ public class DebugModeActivity 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/maplayout/MapInDialogActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java index 3df236f43c..b80ef348e2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapInDialogActivity.java @@ -84,6 +84,12 @@ public class MapInDialogActivity extends AppCompatActivity { } @Override + public void onStart() { + super.onStart(); + mapView.onStart(); + } + + @Override public void onResume() { super.onResume(); mapView.onResume(); @@ -96,6 +102,12 @@ public class MapInDialogActivity extends AppCompatActivity { } @Override + public void onStop() { + super.onStop(); + mapView.onStop(); + } + + @Override public void onDestroy() { super.onDestroy(); mapView.onDestroy(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java index 114262220a..d127e03126 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/MapPaddingActivity.java @@ -58,18 +58,30 @@ public class MapPaddingActivity 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/maplayout/SurfaceViewMediaControlActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SurfaceViewMediaControlActivity.java index 43b4264661..875e53d5bb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SurfaceViewMediaControlActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/SurfaceViewMediaControlActivity.java @@ -55,18 +55,30 @@ public class SurfaceViewMediaControlActivity extends AppCompatActivity implement } @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/maplayout/VideoViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VideoViewActivity.java index 96637fae87..d114ae1b70 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VideoViewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/VideoViewActivity.java @@ -60,18 +60,30 @@ public class VideoViewActivity 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 public void onLowMemory() { super.onLowMemory(); mapView.onLowMemory(); |