diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-12-21 21:06:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-21 21:06:26 +0100 |
commit | dff42cac689031a250e59b3f435da5f8c9524bec (patch) | |
tree | 0cd3e049a5c1c9f3b38645ce0db2ac685e5b4596 /platform/android/MapboxGLAndroidSDKTestApp/src/main | |
parent | 8a0dee6ebd000a0e95a16433a34dc243d430ccd6 (diff) | |
download | qtlocation-mapboxgl-dff42cac689031a250e59b3f435da5f8c9524bec.tar.gz |
[android] - harden MapboxMapOptions, extract duplicate fragment logic, fixup DoubleMapActivity (#7507)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')
2 files changed, 16 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java index ca499c871e..7dcca89a04 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/fragment/SupportMapFragmentActivity.java @@ -56,7 +56,7 @@ public class SupportMapFragmentActivity extends AppCompatActivity implements OnM .zoom(11) .build()); - mapFragment = SupportMapFragment.newInstance(options); + mapFragment = SupportMapFragment.newInstance(); transaction.add(R.id.fragment_container, mapFragment, "com.mapbox.map"); transaction.commit(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java index 5cb340bdd3..6c43e28237 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.java @@ -47,13 +47,10 @@ public class DoubleMapActivity extends AppCompatActivity { actionBar.setDisplayShowHomeEnabled(true); } - Fragment mapFragment; if (savedInstanceState == null) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.add(R.id.fragment_container, mapFragment = new DoubleMapFragment(), TAG_FRAGMENT); + transaction.add(R.id.fragment_container, new DoubleMapFragment(), TAG_FRAGMENT); transaction.commit(); - } else { - mapFragment = (DoubleMapFragment) getSupportFragmentManager().findFragmentByTag(TAG_FRAGMENT); } } @@ -151,6 +148,13 @@ public class DoubleMapActivity extends AppCompatActivity { } @Override + public void onStart() { + super.onStart(); + mapView.onStart(); + mapViewMini.onStart(); + } + + @Override public void onPause() { super.onPause(); mapView.onPause(); @@ -158,6 +162,13 @@ public class DoubleMapActivity extends AppCompatActivity { } @Override + public void onStop() { + super.onStop(); + mapView.onStop(); + mapViewMini.onStop(); + } + + @Override public void onDestroy() { super.onDestroy(); mapView.onDestroy(); |