Fixes #11472

Fixes #11471
xamarin · Jul 20, 2020 · 8e291f5 · 8e291f5
1 parent 13e79c0
commit 8e291f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...s.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DateTimePickerLocalizationTests.cs b/...s.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DateTimePickerLocalizationTests.cs
@@ -16,7 +16,7 @@ namespace Xamarin.Forms.Controls.Issues
     [Category(UITestCategories.DatePicker)]
 #endif
     [Preserve(AllMembers = true)]
-    [Issue(IssueTracker.None, 88888888, "DateTime Localization Issue",
+    [Issue(IssueTracker.Github, 11472, "DateTime Localization Issue",
         PlatformAffected.iOS | PlatformAffected.Android)]
     public class DateTimeLocalizationTests : TestNavigationPage
     {

diff --git a/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs
@@ -175,7 +175,14 @@ void OnCancelButtonClicked(object sender, EventArgs e)
 
 		void SetDate(DateTime date)
 		{
-			EditText.Text = date.ToString(Element.Format);
+			if (Element.Format == "")
+			{
+				EditText.Text = date.ToShortDateString();
+			}
+			else
+			{
+				EditText.Text = date.ToString(Element.Format);
+			}
 		}
 
 		void UpdateCharacterSpacing()