From 43f27e837cb444ba4263405aa4c39a651b222067 Mon Sep 17 00:00:00 2001
From: tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 27 Mar 2019 16:52:29 +0100
Subject: [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.

---
 .../MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml       | 9 ++++++---
 .../src/main/res/layout/activity_backstack_fragment.xml          | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/main')

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
-- 
cgit v1.2.1