summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.ControlGallery.Android
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@gmail.com>2017-08-10 22:41:05 (GMT)
committerE.Z. Hart <hartez@gmail.com>2017-08-10 22:42:41 (GMT)
commit9adeedceb96d918745fa9a19e72869f153c9e01b (patch)
tree5118d97904bad344c464f124d1ad645020276c03 /Xamarin.Forms.ControlGallery.Android
parent44c6ccdd6bbd881b4054b6542d2a07572e7ec326 (diff)
downloadxamarin-forms-9adeedceb96d918745fa9a19e72869f153c9e01b.zip
xamarin-forms-9adeedceb96d918745fa9a19e72869f153c9e01b.tar.gz
xamarin-forms-9adeedceb96d918745fa9a19e72869f153c9e01b.tar.bz2
Add check to avoid running AppCompat-specific tests on pre-AppCompat
Fix race conditions in tests running agaist FormsApplicationActivity
Diffstat (limited to 'Xamarin.Forms.ControlGallery.Android')
-rw-r--r--Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs7
-rw-r--r--Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs7
2 files changed, 14 insertions, 0 deletions
diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
index e07c860..9a33107 100644
--- a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
@@ -5,6 +5,7 @@ using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.OS;
+using Java.Interop;
using Xamarin.Forms.Controls;
using Xamarin.Forms.Controls.Issues;
using Xamarin.Forms.Platform.Android;
@@ -73,6 +74,12 @@ namespace Xamarin.Forms.ControlGallery.Android
LoadApplication(_app);
}
+
+ [Export("IsPreAppCompat")]
+ public bool IsPreAppCompat()
+ {
+ return false;
+ }
}
}
diff --git a/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
index 7c999ce..15f40d2 100644
--- a/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
+++ b/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
using Android.App;
using Android.Content.PM;
using Android.OS;
+using Java.Interop;
using Xamarin.Forms.Controls;
using Xamarin.Forms.Platform.Android;
@@ -44,6 +45,12 @@ namespace Xamarin.Forms.ControlGallery.Android
LoadApplication(app);
}
+
+ [Export("IsPreAppCompat")]
+ public bool IsPreAppCompat()
+ {
+ return true;
+ }
}
}