Remove StateTriggersExperimental flag (#10999)

xamarin · Jun 16, 2020 · a63fe11 · a63fe11
1 parent 63f33c6
commit a63fe11
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 30 deletions.
diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/StateTriggerGallery.cs b/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/StateTriggerGallery.cs
@@ -6,18 +6,10 @@ public StateTriggerGallery()
 		{
 			Title = "StateTrigger Gallery";
 
-			var button = new Button
-			{
-				Text = "Enable StateTriggers",
-				AutomationId = "EnableStateTriggers"
-			};
-			button.Clicked += ButtonClicked;
-
 			Content = new StackLayout
 			{
 				Children =
 				{
-					button,
 					GalleryBuilder.NavButton("MinWindowWidth AdaptiveTrigger Gallery", () => new MinWindowWidthAdaptiveTriggerGallery(), Navigation),
 					GalleryBuilder.NavButton("MinWindowHeight AdaptiveTrigger Gallery", () => new MinWindowHeightAdaptiveTriggerGallery(), Navigation),
 					GalleryBuilder.NavButton("CompareStateTrigger Gallery", () => new CompareStateTriggerGallery(), Navigation),
@@ -30,16 +22,5 @@ public StateTriggerGallery()
 				}
 			};
 		}
-
-		void ButtonClicked(object sender, System.EventArgs e)
-		{
-			var button = sender as Button;
-
-			button.Text = "StateTriggers Enabled!";
-			button.TextColor = Color.Black;
-			button.IsEnabled = false;
-
-			Device.SetFlags(new[] { ExperimentalFlags.StateTriggersExperimental });
-		}
 	}
 }
diff --git a/Xamarin.Forms.Core.UnitTests/StateTriggerTests.cs b/Xamarin.Forms.Core.UnitTests/StateTriggerTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace Xamarin.Forms.Core.UnitTests
 {
@@ -36,13 +35,6 @@ static VisualStateGroupList CreateTestStateGroups()
 			return stateGroups;
 		}
 
-
-		[SetUp]
-		public void Setup()
-		{
-			Device.SetFlags(new List<string> { ExperimentalFlags.StateTriggersExperimental });
-		}
-
 		[Test]
 		public void InitialStateIsNormalIfAvailable()
 		{

diff --git a/Xamarin.Forms.Core/ExperimentalFlags.cs b/Xamarin.Forms.Core/ExperimentalFlags.cs
@@ -9,7 +9,6 @@ namespace Xamarin.Forms
 {
 	internal static class ExperimentalFlags
 	{
-		internal const string StateTriggersExperimental = "StateTriggers_Experimental";
 		internal const string ShellUWPExperimental = "Shell_UWP_Experimental";
 		internal const string CarouselViewExperimental = "CarouselView_Experimental";
 		internal const string SwipeViewExperimental = "SwipeView_Experimental";

diff --git a/Xamarin.Forms.Core/StateTriggerBase.cs b/Xamarin.Forms.Core/StateTriggerBase.cs
@@ -9,7 +9,7 @@ public abstract class StateTriggerBase : BindableObject
 
 		public StateTriggerBase()
 		{
-			ExperimentalFlags.VerifyFlagEnabled(nameof(StateTriggerBase), ExperimentalFlags.StateTriggersExperimental);
+
 		}
 
 		public bool IsActive