diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-03-27 16:52:29 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-03-29 13:30:05 +0100 |
| commit | 43f27e837cb444ba4263405aa4c39a651b222067 (patch) | |
| tree | ae5679240d45376fde94145df9cd1ded0f914cbe /platform/android/MapboxGLAndroidSDKTestApp/src/main | |
| parent | 4e335d0b050c6d5b94ae0d28cb4fd36b939ad84b (diff) | |
| download | qtlocation-mapboxgl-43f27e837cb444ba4263405aa4c39a651b222067.tar.gz | |
[android] - use different Activity launchmode setup.
This faills on pre 6.0 and post 9.0 Androdid OS
versions. Stabilize tests. Ignore telemetry dialog test.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index cec5bd879b..a5cc549cc2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -173,7 +173,8 @@ <activity android:name=".activity.fragment.FragmentBackStackActivity" android:description="@string/description_map_fragment_backstack" - android:label="@string/activity_map_fragment_backstack"> + android:label="@string/activity_map_fragment_backstack" + android:launchMode="singleInstance"> <meta-data android:name="@string/category" android:value="@string/category_integration" /> @@ -407,7 +408,8 @@ <activity android:name=".activity.maplayout.SimpleMapActivity" android:description="@string/description_simple_map" - android:label="@string/activity_simple_map"> + android:label="@string/activity_simple_map" + android:launchMode="singleInstance"> <meta-data android:name="@string/category" android:value="@string/category_basic" /> @@ -720,7 +722,8 @@ <activity android:name=".activity.textureview.TextureViewDebugModeActivity" android:description="@string/description_textureview_debug" - android:label="@string/activity_textureview_debug"> + android:label="@string/activity_textureview_debug" + android:launchMode="singleInstance"> <meta-data android:name="@string/category" android:value="@string/category_basic" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml index b6b672cf73..10c11a9320 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_backstack_fragment.xml @@ -10,6 +10,7 @@ <Button android:layout_width="match_parent" android:layout_height="58dp" android:id="@+id/button" + android:contentDescription="btn_change_fragment" android:text="Replace with empty fragment"/> </FrameLayout>
\ No newline at end of file |