fix: Fix support for TextBlock under Android 10

Fixes #2016
unoplatform · May 8, 2020 · fdc7327 · fdc7327
1 parent 7b05b51
commit fdc7327
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.Android.cs b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.Android.cs
@@ -54,7 +54,10 @@ public partial class TextBlock : FrameworkElement
 
 		static TextBlock()
 		{
-			InitializeStaticLayoutInterop();
+			if ((int)Android.OS.Build.VERSION.SdkInt < 28)
+			{
+				InitializeStaticLayoutInterop();
+			}
 		}
 
 		/// <summary>
@@ -660,7 +663,9 @@ private void MakeLayout(int width, int maxLines = int.MaxValue)
 					}
 				}
 
-				Layout = UnoStaticLayoutBuilder.Build(
+				if ((int)Android.OS.Build.VERSION.SdkInt < 28)
+				{
+					Layout = UnoStaticLayoutBuilder.Build(
 						/*source:*/ _textFormatted,
 						/*paint: */ _paint,
 						/*outerwidth: */ width,
@@ -672,6 +677,21 @@ private void MakeLayout(int width, int maxLines = int.MaxValue)
 						/*ellipsizedWidth: */ width,
 						/*maxLines: */ maxLines
 					);
+				}
+				else
+				{
+					Layout = StaticLayout.Builder.Obtain(_textFormatted, 0, _textFormatted.Length(), _paint, width)
+					.SetLineSpacing(_addedSpacing = GetSpacingAdd(_paint), 1)
+					.SetMaxLines(maxLines)
+					.SetEllipsize(_ellipsize)
+					.SetEllipsizedWidth(width)
+					.SetAlignment(_layoutAlignment)
+					.SetIncludePad(true)
+					.Build();
+				}
+
+
+
 			}
 		}