Skip to content

[Android] Fix Entry password visibility when using Keyboard.Password #36280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubaflo merged 7 commits into from
Jul 3, 2026
Merged

[Android] Fix Entry password visibility when using Keyboard.Password #36280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be621ef
Fix Entry password visibility with Keyboard.Password
jpd21122012 Jul 1, 2026
351ca65
Avoid duplicate Entry cast when setting Android input type
jpd21122012 Jul 1, 2026
083944b
Added Android device tests covering Keyboard.Password with IsPassword…
jpd21122012 Jul 1, 2026
83259f6
Merge branch 'fix/35650-KeyboardPasswordForceIsPassword-Android' of h…
jpd21122012 Jul 1, 2026
50f2ba9
Refactor Entry password input type handling
jpd21122012 Jul 1, 2026
8ea4768
Simplify password input type flag clearing
jpd21122012 Jul 1, 2026
a783d6f
Clear password flags only for matching input classes
jpd21122012 Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,79 @@ await InvokeOnMainThreadAsync(() =>
AssertTranslationMatches(nativeView, entry.TranslationX, entry.TranslationY);
});
}

[Fact]
[Category(TestCategory.Entry)]
public async Task KeyboardPasswordDoesNotForcePasswordVisibilityWhenIsPasswordFalse()
{
var entry = new Entry
{
Keyboard = Keyboard.Password,
IsPassword = false,
Text = "Password"
};

var handler = await CreateHandlerAsync<EntryHandler>(entry);
var platformEntry = GetPlatformControl(handler);

await InvokeOnMainThreadAsync(() =>
{
Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationPassword));
Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.NumberVariationPassword));
});
}

[Fact]
[Category(TestCategory.Entry)]
public async Task KeyboardPasswordRespectsIsPasswordToggle()
{
var entry = new Entry
{
Keyboard = Keyboard.Password,
IsPassword = false,
Text = "Password"
};

var handler = await CreateHandlerAsync<EntryHandler>(entry);
var platformEntry = GetPlatformControl(handler);

await InvokeOnMainThreadAsync(() =>
{
Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationPassword));

entry.IsPassword = true;
handler.UpdateValue(nameof(IEntry.IsPassword));

Assert.True(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationPassword));

entry.IsPassword = false;
handler.UpdateValue(nameof(IEntry.IsPassword));

Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationPassword));
Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.NumberVariationPassword));
});
}

[Fact]
[Category(TestCategory.Entry)]
public async Task KeyboardUrlPreservesUrlInputTypeWhenIsPasswordFalse()
{
var entry = new Entry
{
Keyboard = Keyboard.Url,
IsPassword = false,
Text = "https://dot.net"
};

var handler = await CreateHandlerAsync<EntryHandler>(entry);
var platformEntry = GetPlatformControl(handler);

await InvokeOnMainThreadAsync(() =>
{
Assert.True(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.ClassText));
Assert.True(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationUri));
Assert.False(platformEntry.InputType.HasFlag(global::Android.Text.InputTypes.TextVariationPassword));
});
}
}
}
22 changes: 17 additions & 5 deletions src/Core/src/Platform/Android/EditTextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,24 @@ internal static void SetInputType(this EditText editText, ITextInput textInput)
editText.KeyListener = LocalizedDigitsKeyListener.Create(editText.InputType);
}

if (textInput is IEntry entry && entry.IsPassword)
if (textInput is IEntry entry)
{
if (editText.InputType.HasFlag(InputTypes.ClassText))
editText.InputType |= InputTypes.TextVariationPassword;
if (editText.InputType.HasFlag(InputTypes.ClassNumber))
editText.InputType |= InputTypes.NumberVariationPassword;
if (entry.IsPassword)
{
if (editText.InputType.HasFlag(InputTypes.ClassText))
editText.InputType |= InputTypes.TextVariationPassword;

if (editText.InputType.HasFlag(InputTypes.ClassNumber))
editText.InputType |= InputTypes.NumberVariationPassword;
}
else
{
if (editText.InputType.HasFlag(InputTypes.ClassText))
editText.InputType &= ~InputTypes.TextVariationPassword;

if (editText.InputType.HasFlag(InputTypes.ClassNumber))
editText.InputType &= ~InputTypes.NumberVariationPassword;
}
}

if (textInput is IEditor)
Expand Down
Loading