diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-04-16 11:06:31 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-04-16 11:06:31 +0200 |
commit | 2cb9414e04b3c8ec05c46579fa324597542c6531 (patch) | |
tree | 85d1f778b415731207237784eb09e67f54e33686 | |
parent | 582d0e5885c7a508b164c63f471c27d9398a2d7d (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-view-container-example.tar.gz |
[android] - add example of MapView removal in custom containerupstream/tvn-view-container-example
8 files changed, 278 insertions, 143 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index 442635f909..fc3759b21c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.mapbox.mapboxsdk.testapp"> + package="com.mapbox.mapboxsdk.testapp"> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <application android:name=".MapboxApplication" @@ -18,9 +18,9 @@ android:label="@string/app_name" android:launchMode="singleTop"> <intent-filter> - <action android:name="android.intent.action.MAIN" /> + <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER" /> + <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> <activity @@ -29,10 +29,10 @@ android:label="@string/activity_info_window"> <meta-data android:name="@string/category" - android:value="@string/category_infowindow" /> + android:value="@string/category_infowindow"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.infowindow.InfoWindowAdapterActivity" @@ -40,10 +40,10 @@ android:label="@string/activity_infowindow_adapter"> <meta-data android:name="@string/category" - android:value="@string/category_infowindow" /> + android:value="@string/category_infowindow"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.infowindow.DynamicInfoWindowAdapterActivity" @@ -51,10 +51,10 @@ android:label="@string/activity_dynamic_infowindow_adapter"> <meta-data android:name="@string/category" - android:value="@string/category_infowindow" /> + android:value="@string/category_infowindow"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.BulkMarkerActivity" @@ -63,10 +63,10 @@ android:label="@string/activity_add_bulk_markers"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.AnimatedMarkerActivity" @@ -74,10 +74,10 @@ android:label="@string/activity_animated_marker"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.DynamicMarkerChangeActivity" @@ -85,10 +85,10 @@ android:label="@string/activity_dynamic_marker"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.PressForMarkerActivity" @@ -96,10 +96,10 @@ android:label="@string/activity_press_for_marker"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.CameraAnimationTypeActivity" @@ -107,10 +107,10 @@ android:label="@string/activity_camera_animation_types"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.CameraAnimatorActivity" @@ -118,10 +118,10 @@ android:label="@string/activity_camera_animator"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.CameraPositionActivity" @@ -129,10 +129,10 @@ android:label="@string/activity_camera_position"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.LatLngBoundsActivity" @@ -141,10 +141,10 @@ android:screenOrientation="portrait"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.fragment.MapFragmentActivity" @@ -152,10 +152,10 @@ android:label="@string/activity_map_fragment"> <meta-data android:name="@string/category" - android:value="@string/category_fragment" /> + android:value="@string/category_fragment"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.fragment.SupportMapFragmentActivity" @@ -163,10 +163,10 @@ android:label="@string/activity_map_fragment_suport"> <meta-data android:name="@string/category" - android:value="@string/category_fragment" /> + android:value="@string/category_fragment"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.fragment.MultiMapActivity" @@ -174,10 +174,10 @@ android:label="@string/activity_multimap"> <meta-data android:name="@string/category" - android:value="@string/category_fragment" /> + android:value="@string/category_fragment"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.ManualZoomActivity" @@ -185,10 +185,10 @@ android:label="@string/activity_camera_zoom"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.MaxMinZoomActivity" @@ -196,10 +196,10 @@ android:label="@string/activity_minmax_zoom"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.customlayer.CustomLayerActivity" @@ -207,10 +207,10 @@ android:label="@string/activity_custom_layer"> <meta-data android:name="@string/category" - android:value="@string/category_custom_layer" /> + android:value="@string/category_custom_layer"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.PolygonActivity" @@ -218,10 +218,10 @@ android:label="@string/activity_polygon"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.PolylineActivity" @@ -229,10 +229,10 @@ android:label="@string/activity_polyline"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.ScrollByActivity" @@ -241,10 +241,10 @@ android:theme="@style/NoActionBar"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.MapPaddingActivity" @@ -253,10 +253,10 @@ android:screenOrientation="portrait"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.DebugModeActivity" @@ -265,7 +265,7 @@ android:label="@string/activity_debug_mode"> <meta-data android:name="@string/category" - android:value="@string/category_basic" /> + android:value="@string/category_basic"/> </activity> <activity android:name=".activity.offline.OfflineActivity" @@ -273,10 +273,10 @@ android:label="@string/activity_offline"> <meta-data android:name="@string/category" - android:value="@string/category_offline" /> + android:value="@string/category_offline"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.offline.UpdateMetadataActivity" @@ -284,10 +284,10 @@ android:label="@string/activity_update_metadata"> <meta-data android:name="@string/category" - android:value="@string/category_offline" /> + android:value="@string/category_offline"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.offline.DeleteRegionActivity" @@ -295,10 +295,10 @@ android:label="@string/activity_offline_region_delete"> <meta-data android:name="@string/category" - android:value="@string/category_offline" /> + android:value="@string/category_offline"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.imagegenerator.SnapshotActivity" @@ -306,10 +306,10 @@ android:label="@string/activity_snapshot"> <meta-data android:name="@string/category" - android:value="@string/category_imagegenerator" /> + android:value="@string/category_imagegenerator"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.snapshot.MapSnapshotterActivity" @@ -317,10 +317,10 @@ android:label="@string/activity_map_snapshotter"> <meta-data android:name="@string/category" - android:value="@string/category_imagegenerator" /> + android:value="@string/category_imagegenerator"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.snapshot.MapSnapshotterReuseActivity" @@ -328,10 +328,10 @@ android:label="@string/activity_map_snapshotter_reuse"> <meta-data android:name="@string/category" - android:value="@string/category_imagegenerator" /> + android:value="@string/category_imagegenerator"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.snapshot.MapSnapshotterMarkerActivity" @@ -339,10 +339,10 @@ android:label="@string/activity_map_snapshotter_marker"> <meta-data android:name="@string/category" - android:value="@string/category_imagegenerator" /> + android:value="@string/category_imagegenerator"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.DoubleMapActivity" @@ -350,10 +350,10 @@ android:label="@string/activity_double_map"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.MarkerViewActivity" @@ -361,10 +361,10 @@ android:label="@string/activity_view_marker"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.fragment.ViewPagerActivity" @@ -372,10 +372,10 @@ android:label="@string/activity_viewpager"> <meta-data android:name="@string/category" - android:value="@string/category_fragment" /> + android:value="@string/category_fragment"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.SimpleMapActivity" @@ -383,10 +383,10 @@ android:label="@string/activity_simple_map"> <meta-data android:name="@string/category" - android:value="@string/category_basic" /> + android:value="@string/category_basic"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.MapChangeActivity" @@ -394,10 +394,10 @@ android:label="@string/activity_map_change"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.VisibilityChangeActivity" @@ -405,10 +405,10 @@ android:label="@string/activity_map_visibility"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.RuntimeStyleActivity" @@ -416,10 +416,10 @@ android:label="@string/activity_runtime_style"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.DataDrivenStyleActivity" @@ -427,10 +427,10 @@ android:label="@string/activity_data_driven_style"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.CircleLayerActivity" @@ -438,10 +438,10 @@ android:label="@string/activity_circle_layer"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.FillExtrusionActivity" @@ -449,10 +449,10 @@ android:label="@string/activity_fill_extrusion_layer"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.BuildingFillExtrusionActivity" @@ -460,10 +460,10 @@ android:label="@string/activity_building_fill_extrusion_layer"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.SymbolLayerActivity" @@ -471,10 +471,10 @@ android:label="@string/activity_symbol_layer"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.GeoJsonClusteringActivity" @@ -482,10 +482,10 @@ android:label="@string/activity_geojson_clustering"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.RealTimeGeoJsonActivity" @@ -493,10 +493,10 @@ android:label="@string/activity_geojson_realtime"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.StyleFileActivity" @@ -504,10 +504,10 @@ android:label="@string/activity_style_file"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.CustomSpriteActivity" @@ -515,10 +515,10 @@ android:label="@string/activity_add_sprite"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.imagegenerator.PrintActivity" @@ -526,10 +526,10 @@ android:label="@string/activity_print"> <meta-data android:name="@string/category" - android:value="@string/category_imagegenerator" /> + android:value="@string/category_imagegenerator"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.AnimatedImageSourceActivity" @@ -537,10 +537,10 @@ android:label="@string/activity_animated_image_source"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.GridSourceActivity" @@ -548,10 +548,10 @@ android:label="@string/activity_grid_source"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <!-- Features --> <activity @@ -560,10 +560,10 @@ android:label="@string/activity_query_rendered_feature_properties"> <meta-data android:name="@string/category" - android:value="@string/category_features" /> + android:value="@string/category_features"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.feature.QueryRenderedFeaturesBoxCountActivity" @@ -571,10 +571,10 @@ android:label="@string/activity_query_rendered_features_box_count"> <meta-data android:name="@string/category" - android:value="@string/category_features" /> + android:value="@string/category_features"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.feature.QueryRenderedFeaturesBoxSymbolCountActivity" @@ -582,10 +582,10 @@ android:label="@string/activity_query_rendered_features_box_symbol_count"> <meta-data android:name="@string/category" - android:value="@string/category_features" /> + android:value="@string/category_features"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.feature.QueryRenderedFeaturesBoxHighlightActivity" @@ -593,10 +593,10 @@ android:label="@string/activity_query_rendered_features_box_highlight"> <meta-data android:name="@string/category" - android:value="@string/category_features" /> + android:value="@string/category_features"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.feature.QuerySourceFeaturesActivity" @@ -604,10 +604,10 @@ android:label="@string/activity_query_source_features"> <meta-data android:name="@string/category" - android:value="@string/category_features" /> + android:value="@string/category_features"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.SymbolGeneratorActivity" @@ -615,10 +615,10 @@ android:label="@string/activity_symbol_generator"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.ZoomFunctionSymbolLayerActivity" @@ -626,10 +626,10 @@ android:label="@string/activity_add_remove_markers"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.MapInDialogActivity" @@ -637,10 +637,10 @@ android:label="@string/activity_map_in_dialog"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.annotation.MarkerViewsInRectangleActivity" @@ -648,10 +648,10 @@ android:label="@string/activity_marker_view_rectangle"> <meta-data android:name="@string/category" - android:value="@string/category_annotation" /> + android:value="@string/category_annotation"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.LatLngBoundsForCameraActivity" @@ -659,10 +659,10 @@ android:label="@string/activity_restricted_bounds"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <!-- Storage --> @@ -672,10 +672,10 @@ android:label="@string/activity_url_transform"> <meta-data android:name="@string/category" - android:value="@string/category_storage" /> + android:value="@string/category_storage"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.maplayout.BottomSheetActivity" @@ -683,7 +683,7 @@ android:label="@string/activity_bottom_sheet"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> </activity> <!-- TextureView --> @@ -693,7 +693,7 @@ android:label="@string/activity_textureview_debug"> <meta-data android:name="@string/category" - android:value="@string/category_textureview" /> + android:value="@string/category_textureview"/> </activity> <activity android:name=".activity.textureview.TextureViewResizeActivity" @@ -701,7 +701,7 @@ android:label="@string/activity_textureview_resize"> <meta-data android:name="@string/category" - android:value="@string/category_textureview" /> + android:value="@string/category_textureview"/> </activity> <activity android:name=".activity.textureview.TextureViewTransparentBackgroundActivity" @@ -709,10 +709,10 @@ android:label="@string/activity_textureview_transparent"> <meta-data android:name="@string/category" - android:value="@string/category_textureview" /> + android:value="@string/category_textureview"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.textureview.TextureViewAnimationActivity" @@ -720,7 +720,7 @@ android:label="@string/activity_textureview_animate"> <meta-data android:name="@string/category" - android:value="@string/category_textureview" /> + android:value="@string/category_textureview"/> </activity> <activity android:name=".activity.maplayout.LocalGlyphActivity" @@ -728,10 +728,10 @@ android:label="@string/activity_local_glyph"> <meta-data android:name="@string/category" - android:value="@string/category_maplayout" /> + android:value="@string/category_maplayout"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.HillshadeLayerActivity" @@ -739,10 +739,10 @@ android:label="@string/activity_hillshade"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.style.HeatmapLayerActivity" @@ -750,43 +750,54 @@ android:label="@string/activity_heatmaplayer"> <meta-data android:name="@string/category" - android:value="@string/category_style" /> + android:value="@string/category_style"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value=".activity.FeatureOverviewActivity" /> + android:value=".activity.FeatureOverviewActivity"/> </activity> <activity android:name=".activity.camera.GestureDetectorActivity" - android:label="@string/activity_gesture_detector" - android:description="@string/description_gesture_detector"> + android:description="@string/description_gesture_detector" + android:label="@string/activity_gesture_detector"> <meta-data android:name="@string/category" - android:value="@string/category_camera" /> + android:value="@string/category_camera"/> <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value="com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity" /> + android:value="com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity"/> + </activity> + <activity + android:name=".activity.maplayout.TabViewActivity" + android:label="@string/activity_view_wrapper" + android:description="@string/description_view_wrapper"> + <meta-data + android:name="@string/category" + android:value="@string/category_maplayout"/> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity"/> </activity> <!-- For Instrumentation tests --> <activity android:name=".activity.style.RuntimeStyleTestActivity" - android:screenOrientation="portrait" /> + android:screenOrientation="portrait"/> <activity android:name=".activity.style.RuntimeStyleTimingTestActivity" - android:screenOrientation="portrait" /> + android:screenOrientation="portrait"/> <activity android:name=".activity.espresso.EspressoTestActivity" - android:screenOrientation="portrait" /> + android:screenOrientation="portrait"/> <activity android:name=".activity.style.FillExtrusionStyleTestActivity" - android:screenOrientation="portrait" /> + android:screenOrientation="portrait"/> <!-- Configuration Settings --> <meta-data android:name="com.mapbox.TestEventsServer" - android:value="api-events-staging.tilestream.net" /> + android:value="api-events-staging.tilestream.net"/> <meta-data android:name="com.mapbox.TestEventsAccessToken" - android:value="pk.eyJ1IjoiYmxzdGFnaW5nIiwiYSI6ImNpdDF3OHpoaTAwMDcyeXA5Y3Z0Nmk2dzEifQ.0IfB7v5Qbm2MGVYt8Kb8fg" /> + android:value="pk.eyJ1IjoiYmxzdGFnaW5nIiwiYSI6ImNpdDF3OHpoaTAwMDcyeXA5Y3Z0Nmk2dzEifQ.0IfB7v5Qbm2MGVYt8Kb8fg"/> <!-- Comment out this setting to switch to external storage (and disable internal) in your app --> <!-- <meta-data --> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TabViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TabViewActivity.java new file mode 100644 index 0000000000..13af82ce83 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/TabViewActivity.java @@ -0,0 +1,37 @@ +package com.mapbox.mapboxsdk.testapp.activity.maplayout; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.ViewGroup; + +import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.view.EmptyView; +import com.mapbox.mapboxsdk.testapp.view.MapViewWrapper; + +public class TabViewActivity extends AppCompatActivity { + + private boolean empty = true; + private MapViewWrapper mapViewWrapper; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_map_tab); + + ViewGroup viewContainer = (ViewGroup) findViewById(R.id.container); + findViewById(R.id.button).setOnClickListener(v -> { + if (mapViewWrapper != null) { + mapViewWrapper.beforeRemoveCleanup(); + mapViewWrapper = null; + } + viewContainer.removeAllViews(); + + if (empty) { + viewContainer.addView(mapViewWrapper = new MapViewWrapper(TabViewActivity.this)); + } else { + viewContainer.addView(new EmptyView(this)); + } + empty = !empty; + }); + } +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/EmptyView.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/EmptyView.java new file mode 100644 index 0000000000..086117833d --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/EmptyView.java @@ -0,0 +1,11 @@ +package com.mapbox.mapboxsdk.testapp.view; + +import android.content.Context; +import android.view.View; + +public class EmptyView extends View { + + public EmptyView(Context context) { + super(context); + } +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewWrapper.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewWrapper.java new file mode 100644 index 0000000000..3bf2996eb3 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/view/MapViewWrapper.java @@ -0,0 +1,51 @@ +package com.mapbox.mapboxsdk.testapp.view; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.widget.FrameLayout; + +import com.mapbox.mapboxsdk.maps.MapView; +import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; + +import timber.log.Timber; + +public class MapViewWrapper extends FrameLayout implements OnMapReadyCallback { + + private MapView mapView; + + public MapViewWrapper(@NonNull Context context) { + super(context); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + mapView = new MapView(getContext()); + addView(mapView); + + mapView.onCreate(null); + mapView.getMapAsync(mapboxMap -> { + + }); + mapView.onStart(); + mapView.onResume(); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + removeView(mapView); + } + + public void beforeRemoveCleanup(){ + mapView.onPause(); + mapView.onStop(); + mapView.onDestroy(); + } + + @Override + public void onMapReady(MapboxMap mapboxMap) { + Timber.e("onMapReady"); + } +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_tab.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_tab.xml new file mode 100644 index 0000000000..11dbe9cee4 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_tab.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".activity.maplayout.SimpleMapActivity"> + + <FrameLayout + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <Button + android:id="@+id/button" + android:text="@string/toggle_wrapper_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center"/> + +</FrameLayout> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml index 04d2e8d56e..b1be4922c6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/actions.xml @@ -87,4 +87,5 @@ <string name="zoom_by_2">Zoom by 2</string> <string name="zoom_to_point">Zoom to point</string> <string name="zoom_to_4">Zoom to 4</string> + <string name="toggle_wrapper_view">Toggle View</string> </resources>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml index 5238176ce8..489ecbc759 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml @@ -68,4 +68,5 @@ <string name="description_hillshade">Example raster-dem source and hillshade layer</string> <string name="description_heatmaplayer">Use HeatmapLayer to visualise earthquakes</string> <string name="description_gesture_detector">Manipulate gestures detector\'s settings</string> + <string name="description_view_wrapper">Use a wrapping view to encapsulate a MapView</string> </resources> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml index 89ec586950..a2f18abce8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/titles.xml @@ -68,4 +68,5 @@ <string name="activity_hillshade">Hillshade</string> <string name="activity_heatmaplayer">Heatmap layer</string> <string name="activity_gesture_detector">Gestures detector</string> + <string name="activity_view_wrapper">View wrapper</string> </resources>
\ No newline at end of file |