From b7056ad720424597273a577cc57598b8b9751eae Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Fri, 5 Feb 2021 12:35:45 -0600
Subject: [PATCH] Google material bump and set hint to transparent for multi
 line (#13647)

* Bump Google Material

* Bump material and set HintText to transparent on multi line controls
---
 .nuspec/Xamarin.Forms.Visual.Material.nuspec       |  2 +-
 .nuspec/Xamarin.Forms.nuspec                       |  2 +-
 .../DualScreen.Android/DualScreen.Android.csproj   |  2 +-
 .../Embedding.Droid/Directory.Build.targets        |  2 +-
 ...arin.Forms.Platform.Android (Forwarders).csproj |  4 ++--
 .../Directory.Build.targets                        |  2 +-
 .../Nuget.Build.targets                            |  2 +-
 .../VisualControlsPage.xaml                        | 14 +++++++++++++-
 .../VisualControlsPage.xaml.cs                     |  2 ++
 .../Xamarin.Forms.DualScreen.csproj                |  2 +-
 .../Xamarin.Forms.Maps.Android.csproj              |  2 +-
 .../MaterialEditorRenderer.cs                      |  3 +++
 .../Xamarin.Forms.Material.Android.csproj          |  2 +-
 .../Xamarin.Forms.Platform.Android.csproj          |  2 +-
 14 files changed, 30 insertions(+), 13 deletions(-)

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 @@
 
       <group targetFramework="MonoAndroid10.0">
         <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4" />
-        <dependency id="Xamarin.Google.Android.Material" version="1.1.0.5" />
+        <dependency id="Xamarin.Google.Android.Material" version="1.2.1.1" />
       </group>
       <group targetFramework="Xamarin.iOS10">
         <dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>
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 @@
     <dependencies>
       <group targetFramework="MonoAndroid10.0">
         <dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.2.0.4" />
-        <dependency id="Xamarin.Google.Android.Material" version="1.1.0.5" />
+        <dependency id="Xamarin.Google.Android.Material" version="1.2.1.1" />
         <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.6" />
         <dependency id="Xamarin.AndroidX.Browser" version="1.3.0" />
       </group>
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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
   </ItemGroup>
   <ItemGroup>
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 @@
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
     <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
   </ItemGroup>
 </Project>
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 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
-    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.6" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
   </ItemGroup>
 </Project>
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 @@
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
     <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
   </ItemGroup>
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 @@
     <ItemGroup>
         <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
         <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0" />
-        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
         <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
         <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
     </ItemGroup>
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 @@
                     <Label Text="Background GradientColor" Margin="0,0,0,-10" />
                     <CheckBox Background="{StaticResource GreenGradient}" IsChecked="True" />
                     <CheckBox Background="{StaticResource BlueGradient}" IsChecked="True" />
-
                 </StackLayout>
             </ScrollView>
         </ContentPage>
@@ -379,4 +378,17 @@
             </ScrollView>
         </ContentPage>
     </FlyoutItem>
+    <FlyoutItem Title="Placeholder Test">
+        <ContentPage>
+            <ScrollView>
+                <StackLayout Spacing="20" Padding="10" BackgroundColor="White">
+                    <Label Text="Placeholder looks correcct" Margin="0,0,0,-10" />
+                    <StackLayout Orientation="Vertical">
+                        <Editor x:Name="delayLoadingEditor" Placeholder="Text" AutoSize="TextChanges" BackgroundColor="White" />
+                        <Entry x:Name="delayLoadingEntry" Placeholder="Text"  BackgroundColor="White" />
+                    </StackLayout>
+                </StackLayout>
+            </ScrollView>
+        </ContentPage>
+    </FlyoutItem>
 </local:TestShell>
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 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
   </ItemGroup>
 </Project>
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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
     <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.0" />
   </ItemGroup>
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 @@
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.4" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.6" />
   </ItemGroup>
   <ItemGroup>