From a4471e2a78d7e3d50e92bd8cf93be836a6bf4a14 Mon Sep 17 00:00:00 2001 From: Shane Neuville Date: Sat, 5 Jul 2025 12:47:33 -0500 Subject: [PATCH] Revert "Fixed picker allows user input if the keyboard is visible (#26382)" This reverts commit 228b7bf564f565d96536edce7602f5df3163c0b2. --- ...ShouldNotAllowUserInputThroughKeyboard.png | Bin 8174 -> 0 bytes .../TestCases.HostApp/Issues/Issue24930.cs | 29 ------------- .../Tests/Issues/Issue24930.cs | 40 ------------------ .../src/Platform/Android/PickerManager.cs | 4 +- 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/PickerShouldNotAllowUserInputThroughKeyboard.png delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue24930.cs delete mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24930.cs diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PickerShouldNotAllowUserInputThroughKeyboard.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/PickerShouldNotAllowUserInputThroughKeyboard.png deleted file mode 100644 index 84244a3357586afe2046c4b1bf4f43415d91e131..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8174 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 - { - FirstPickerItem, - "Capuchin Monkey" - }; - - Content = new StackLayout() - { - Children = { picker } - }; - } - } -} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24930.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24930.cs deleted file mode 100644 index c9117366287a..000000000000 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24930.cs +++ /dev/null @@ -1,40 +0,0 @@ -#if ANDROID // This test is only for Android, Since the edit text is base view for Picker in Android -using NUnit.Framework; -using UITest.Appium; -using UITest.Core; -namespace Microsoft.Maui.TestCases.Tests.Issues -{ - public class Issue24930 : _IssuesUITest - { - const string FirstPickerItem = "Baboon"; - const string PickerId = "picker"; - - public Issue24930(TestDevice device) : base(device) { } - - public override string Issue => "The picker allows you to write text if the keyboard is visible"; - - // Key codes for "abcd" - int[] keyCodes = new int[] - { - 29,30,31,32 - }; - - [Test] - [Category(UITestCategories.Picker)] - public void PickerShouldNotAllowUserInputThroughKeyboard() - { - App.WaitForElement(PickerId); - App.Tap(PickerId); - App.WaitForElement(FirstPickerItem); - App.Back(); - foreach (var keyCode in keyCodes) - { - App.SendKeys(keyCode); - } - - VerifyScreenshot(); - } - - } -} -#endif \ No newline at end of file diff --git a/src/Core/src/Platform/Android/PickerManager.cs b/src/Core/src/Platform/Android/PickerManager.cs index c37d6c70968e..2af03a5f2ff8 100644 --- a/src/Core/src/Platform/Android/PickerManager.cs +++ b/src/Core/src/Platform/Android/PickerManager.cs @@ -40,12 +40,12 @@ public static void OnFocusChanged(bool gainFocus, EditText sender) static void OnKeyPress(object? sender, AView.KeyEventArgs e) { - //To prevent user from entering text when focus is received - e.Handled = true; if (!AvailableKeys.Contains(e.KeyCode)) { + e.Handled = false; return; } + e.Handled = true; (sender as AView)?.CallOnClick(); }