From 2062015e6fd73351fb254208c50e1bad9513c60d Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Thu, 8 Dec 2022 16:20:57 -0500 Subject: [PATCH 1/2] Minimal fix for when TextTransform isn't set --- .../Core/Platform/Android/Extensions/SearchViewExtensions.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs index 68ea2b1b7942..95cfaa52b2dc 100644 --- a/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs +++ b/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs @@ -8,7 +8,10 @@ public static class SearchViewExtensions { public static void UpdateText(this SearchView searchView, InputView inputView) { - searchView.SetQuery(TextTransformUtilites.GetTransformedText(inputView.Text, inputView.TextTransform), false); + if (inputView.TextTransform == TextTransform.Default || inputView.TextTransform == TextTransform.None) + return; + + searchView.SetQuery((TextTransformUtilites.GetTransformedText(inputView.Text, inputView.TextTransform)), false); } } } From 3de1da914ee7fc8b25759f96e8fefbf57a4bfef0 Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Wed, 4 Jan 2023 13:59:22 -0500 Subject: [PATCH 2/2] Only set query if it's new (pair-program with EZ) --- .../Android/Extensions/SearchViewExtensions.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs index 95cfaa52b2dc..1b84b8d47369 100644 --- a/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs +++ b/src/Controls/src/Core/Platform/Android/Extensions/SearchViewExtensions.cs @@ -1,5 +1,4 @@ -using Android.Widget; -using Microsoft.Maui.Controls.Internals; +using Microsoft.Maui.Controls.Internals; using SearchView = AndroidX.AppCompat.Widget.SearchView; namespace Microsoft.Maui.Controls.Platform @@ -8,10 +7,11 @@ public static class SearchViewExtensions { public static void UpdateText(this SearchView searchView, InputView inputView) { - if (inputView.TextTransform == TextTransform.Default || inputView.TextTransform == TextTransform.None) - return; + var oldQuery = searchView.Query ?? string.Empty; + var newQuery = TextTransformUtilites.GetTransformedText(inputView.Text, inputView.TextTransform); - searchView.SetQuery((TextTransformUtilites.GetTransformedText(inputView.Text, inputView.TextTransform)), false); + if (oldQuery != newQuery) + searchView.SetQuery(newQuery, false); } } -} +} \ No newline at end of file