diff --git a/.nuspec/Xamarin.Forms.Visual.Material.nuspec b/.nuspec/Xamarin.Forms.Visual.Material.nuspec
index ca2296870a0..e5dd8cf8fb6 100644
--- a/.nuspec/Xamarin.Forms.Visual.Material.nuspec
+++ b/.nuspec/Xamarin.Forms.Visual.Material.nuspec
@@ -23,7 +23,7 @@
-
+
diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index 4022bed60a8..4adc17b95fe 100644
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -16,7 +16,7 @@
-
+
diff --git a/DualScreen/DualScreen.Android/DualScreen.Android.csproj b/DualScreen/DualScreen.Android/DualScreen.Android.csproj
index 20f6381a1a8..bb7203035cf 100644
--- a/DualScreen/DualScreen.Android/DualScreen.Android.csproj
+++ b/DualScreen/DualScreen.Android/DualScreen.Android.csproj
@@ -116,7 +116,7 @@
-
+
diff --git a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
index 86573de3be2..13785c309a0 100644
--- a/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
+++ b/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
@@ -3,7 +3,7 @@
-
+
diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
index e7208338203..c0f52ddb663 100644
--- a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
+++ b/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
@@ -24,7 +24,7 @@
-
-
+
+
diff --git a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
index 03073fa35e3..082aa3aff44 100644
--- a/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
+++ b/Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
@@ -2,7 +2,7 @@
-
+
diff --git a/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
index c2fc99c62e3..5093f433d89 100644
--- a/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
+++ b/Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
@@ -7,7 +7,7 @@
-
+
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
index 601c1b49a85..06641657b0d 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
@@ -361,7 +361,6 @@
-
@@ -379,4 +378,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
index ce93b1f48d5..5c9e8364f78 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
@@ -20,8 +20,10 @@ public VisualControlsPage()
{
#if APP
InitializeComponent();
+ Device.BeginInvokeOnMainThread(OnAppearing);
#endif
}
+
protected override void Init()
{
BindingContext = this;
diff --git a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
index ff3632077d3..9ea759461d0 100644
--- a/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
+++ b/Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
@@ -56,7 +56,7 @@
-
+
diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
index 631b2f9cbc8..01f31e100cf 100644
--- a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
+++ b/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
@@ -21,7 +21,7 @@
-
+
diff --git a/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs b/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
index 9d385e9429e..aaa7ecf6925 100644
--- a/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
+++ b/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
@@ -53,6 +53,9 @@ protected override void UpdatePlaceholderText()
return;
_textInputLayout?.SetHint(Element.Placeholder, Element);
+
+ if(!string.IsNullOrWhiteSpace(Element.Placeholder))
+ EditText.SetHintTextColor(global::Android.Graphics.Color.Transparent);
}
protected override void UpdatePlaceholderColor() => ApplyTheme();
diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
index 7e3c466cb28..51730a6d519 100644
--- a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
+++ b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
index b0c4c07104f..7420ed09713 100644
--- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
+++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@ -44,7 +44,7 @@
-
+