Skip to content

Commit

Permalink
[Core,iOS,Android] Remove experimental flags Carousel, Swipe, Shapes,…
Browse files Browse the repository at this point in the history
… Brush (xamarin#12068)

* [Core,iOS,Android] Remove experimental flags Carrousel,Swipe,Shapes,Brush,DragAndDrop

* [Controls]Remove set some experimental flags
  • Loading branch information
rmarinho authored Sep 10, 2020
1 parent e57d160 commit 1882b5d
Show file tree
Hide file tree
Showing 85 changed files with 11 additions and 280 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected override void OnCreate(Bundle bundle)

#if TEST_EXPERIMENTAL_RENDERERS
#else
Forms.SetFlags("UseLegacyRenderers", "SwipeView_Experimental");
Forms.SetFlags("UseLegacyRenderers");
#endif
Forms.Init(this, bundle);

Expand Down
1 change: 0 additions & 1 deletion Xamarin.Forms.ControlGallery.GTK/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ static void Main(string[] args)
GtkOpenGL.Init();
GtkThemes.Init();
Gtk.Application.Init();
Forms.SetFlags("CarouselView_Experimental");
FormsMaps.Init(string.Empty);
Forms.Init();
var app = new App();
Expand Down
3 changes: 1 addition & 2 deletions Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ public partial class MainWindow : FormsApplicationPage
public MainWindow()
{
InitializeComponent();
Forms.SetFlags("CarouselView_Experimental", "RadioButton_Experimental");
Xamarin.Forms.Forms.Init();
FormsMaps.Init("");
LoadApplication(new Controls.App());
}
}
}
}
3 changes: 2 additions & 1 deletion Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)

rootFrame.NavigationFailed += OnNavigationFailed;

Forms.SetFlags("Shell_UWP_Experimental", "SwipeView_Experimental");
Forms.SetFlags("Shell_UWP_Experimental");

Forms.Init (e);
//FormsMaps.Init (Controls.App.Config["UWPMapsAuthKey"]);

Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
App.IOSVersion = int.Parse(versionPart[0]);

Xamarin.Calabash.Start();
Forms.SetFlags("SwipeView_Experimental");

Forms.Init();
FormsMaps.Init();
FormsMaterial.Init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ public Issue10530()

protected override void Init()
{
#if APP
Device.SetFlags(new List<string>(Device.Flags ?? new List<string>()) { "SwipeView_Experimental" });
#endif
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public partial class Issue10679 : TestShell
public Issue10679()
{
#if APP
Device.SetFlags(new List<string>(Device.Flags ?? new List<string>()) { "SwipeView_Experimental" });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public partial class Issue10875 : TestContentPage
public Issue10875()
{
#if APP
Device.SetFlags(new List<string>(Device.Flags ?? new List<string>()) { "SwipeView_Experimental" });
InitializeComponent();
BindingContext = new Issue10875ViewModel();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ public class Issue10940 : TestContentPage
{
public Issue10940()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
#endif
}

protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public partial class Issue11050 : ContentPage
public Issue11050()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });


InitializeComponent();

Device.StartTimer(TimeSpan.FromMilliseconds(15), () =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public partial class Issue11113 : TestContentPage
public Issue11113()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ public class Issue11137 : TestContentPage
{
protected override void Init()
{
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });

Title = "Issue 11137";

var grid = new Grid();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public partial class Issue11190 : TestContentPage
public Issue11190()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public partial class Issue11209 : TestContentPage
public Issue11209()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public class Issue11251 : TestContentPage
{
public Issue11251()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
#endif
}

public ICommand ExecuteMe = new Command(() =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public partial class Issue11262 : TestContentPage
public Issue11262()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ public class Issue11286 : TestContentPage
{
public Issue11286()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
#endif
}

protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public class Issue11314 : TestTabbedPage
{
public Issue11314()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
#endif
}

protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public partial class Issue11333 : TestContentPage
public Issue11333()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public partial class Issue11374 : TestContentPage
public Issue11374()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });

InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public partial class Issue11413 : TestContentPage
public Issue11413()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public Issue11496()
{
#if APP
Title = "Issue 11496";
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public Issue11547()
{
#if APP
Title = "Issue 11547";
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ public class Issue11563 : TestContentPage
{
public Issue11563()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.BrushExperimental, ExperimentalFlags.ShapesExperimental });
#endif
}

protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ public partial class Issue11573 : TestContentPage
public Issue11573()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.BrushExperimental });

InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public partial class Issue11653 : TestContentPage
public Issue11653()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.BrushExperimental, ExperimentalFlags.ShapesExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public Issue11737()
{
#if APP
Title = "Issue 11737";
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
BindingContext = new Issue11737ViewModel();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public Issue11764()
{
#if APP
Title = "Issue 11764";
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();

var random = new Random();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ public class Issue11858 : TestContentPage
{
public Issue11858()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
#endif
}

protected override void Init()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class Issue7678Ios : TestContentPage
public Issue7678Ios()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
Title = "Issue 7678";
BindingContext = new Issue7678IosViewModel();
#endif
Expand Down Expand Up @@ -149,7 +148,6 @@ public class Issue7678Droid : TestContentPage
public Issue7678Droid()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
Title = "Issue 7678";
BindingContext = new Issue7678DroidViewModel();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public partial class Issue7817 : TestContentPage
public Issue7817()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
Title = "Issue 7817";
InitializeComponent();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public partial class Issue7924 : TestContentPage
public Issue7924()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
Title = "Issue 7924";
InitializeComponent();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public partial class Issue8417 : TestContentPage
public Issue8417()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
InitializeComponent();
BindingContext = new Issue8417ViewModel();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public sealed partial class Issue8767 : TestContentPage
public Issue8767()
{
#if APP
Device.SetFlags(new[] { ExperimentalFlags.SwipeViewExperimental });
this.InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public partial class Issue8778 : ContentPage
public Issue8778()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public partial class Issue8781 : ContentPage
public Issue8781()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
BindingContext = this;
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public partial class Issue8782 : TestContentPage
public Issue8782()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
Title = "Issue 8782";
InitializeComponent();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public class Issue9088 : TestShell

protected override void Init()
{
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });

_rightSwipeCountLabel = new Label
{
AutomationId = RightCountLabelId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public partial class Issue9305 : TestContentPage
public Issue9305()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
Title = "Issue 9305";
InitializeComponent();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ public class Issue9306 : TestContentPage

protected override void Init()
{
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });

Title = PageTitle;

_leftSwipeCountLabel = new Label
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ public Issue9588()
InitializeComponent();
#endif
}

protected override void Init()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
#endif
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public partial class Issue9646 : TestContentPage
public Issue9646()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public partial class Issue9734 : ContentPage
public Issue9734()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
BindingContext = new Issue9734ViewModel();
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public partial class Issue9735 : TestContentPage
public Issue9735()
{
#if APP
Device.SetFlags(new List<string> { ExperimentalFlags.SwipeViewExperimental });
InitializeComponent();
#endif
}
Expand Down
Loading

0 comments on commit 1882b5d

Please sign in to comment.