summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.ControlGallery.Android
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@users.noreply.github.com>2017-08-10 14:08:18 -0400
committerRui Marinho <me@ruimarinho.net>2017-08-10 19:08:18 +0100
commit0ff50e2418c1620a86c01004f35dd2855bfe4c0f (patch)
treed7bb35796300b51daea67ad3a37080104aa38dae /Xamarin.Forms.ControlGallery.Android
parent1aab6ff4893935fb3bb91187d2d3fa796576198a (diff)
downloadxamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.tar.gz
xamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.tar.bz2
xamarin-forms-0ff50e2418c1620a86c01004f35dd2855bfe4c0f.zip
Add support for backcompat hint flags (#1074)
* Add support for backcompat hint flags * Making fast renderers internal and sealed while experimental
Diffstat (limited to 'Xamarin.Forms.ControlGallery.Android')
-rw-r--r--Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs16
-rw-r--r--Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs5
-rw-r--r--Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs8
3 files changed, 14 insertions, 15 deletions
diff --git a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
index 8db3fac0..33310332 100644
--- a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
+++ b/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
@@ -30,7 +30,7 @@ using Xamarin.Forms.Controls.Issues;
[assembly: ExportRenderer(typeof(Bugzilla42000._42000NumericEntryNoDecimal), typeof(EntryRendererNoDecimal))]
[assembly: ExportRenderer(typeof(Bugzilla42000._42000NumericEntryNoNegative), typeof(EntryRendererNoNegative))]
-[assembly: ExportRenderer(typeof(AndroidHelpText.HintLabel), typeof(HintLabel))]
+//[assembly: ExportRenderer(typeof(AndroidHelpText.HintLabel), typeof(HintLabel))]
[assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.Issues.NoFlashTestNavigationPage), typeof(Xamarin.Forms.ControlGallery.Android.NoFlashTestNavigationPage))]
@@ -524,13 +524,13 @@ namespace Xamarin.Forms.ControlGallery.Android
}
- public class HintLabel : Xamarin.Forms.Platform.Android.FastRenderers.LabelRenderer
- {
- public HintLabel()
- {
- Hint = AndroidHelpText.HintLabel.Success;
- }
- }
+ //public class HintLabel : Xamarin.Forms.Platform.Android.AppCompat.LabelRenderer
+ //{
+ // public HintLabel()
+ // {
+ // Hint = AndroidHelpText.HintLabel.Success;
+ // }
+ // }
public class NoFlashTestNavigationPage : Xamarin.Forms.Platform.Android.AppCompat.NavigationPageRenderer
{
diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
index afeea537..e07c860b 100644
--- a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
@@ -42,7 +42,12 @@ namespace Xamarin.Forms.ControlGallery.Android
if (!Debugger.IsAttached)
Insights.Initialize(App.InsightsApiKey, ApplicationContext);
+#if TEST_EXPERIMENTAL_RENDERERS
+ Forms.SetFlags("FastRenderers_Experimental");
+#endif
+
Forms.Init(this, bundle);
+
FormsMaps.Init(this, bundle);
AndroidAppLinks.Init(this);
Forms.ViewInitialized += (sender, e) => {
diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
index ee551d2c..84debc76 100644
--- a/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
@@ -44,10 +44,4 @@ using Xamarin.Forms.Controls.Issues;
[assembly: Xamarin.Forms.ResolutionGroupName (Xamarin.Forms.Controls.Issues.Effects.ResolutionGroupName)]
// Deliberately broken image source and handler so we can test handling of image loading errors
-[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))]
-#if TEST_LEGACY_RENDERERS
-[assembly: ExportRenderer(typeof(Button), typeof(Xamarin.Forms.Platform.Android.AppCompat.ButtonRenderer))]
-[assembly: ExportRenderer(typeof(Image), typeof(Xamarin.Forms.Platform.Android.ImageRenderer))]
-[assembly: ExportRenderer(typeof(Label), typeof(Xamarin.Forms.Platform.Android.LabelRenderer))]
-[assembly: ExportRenderer(typeof(Frame), typeof(Xamarin.Forms.Platform.Android.AppCompat.FrameRenderer))]
-#endif \ No newline at end of file
+[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))] \ No newline at end of file