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

src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs

@@ -207,5 +207,57 @@ await InvokeOnMainThreadAsync(() =>
 				AssertTranslationMatches(nativeView, entry.TranslationX, entry.TranslationY);
 			});
 		}
+
+		[Fact]
+		[Category(TestCategory.Entry)]
+		public async Task KeyboardPasswordDoesNotForcePasswordVisibilityWhenIsPasswordIsFalse()
+		{
+			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));
+			});
+		}
 	}
 }

src/Core/src/Platform/Android/EditTextExtensions.cs

@@ -382,6 +382,25 @@
 				if (editText.InputType.HasFlag(InputTypes.ClassNumber))
 					editText.InputType |= InputTypes.NumberVariationPassword;
 			}
+			else if (textInput is IEntry)
+			{
+				editText.InputType &= ~InputTypes.TextVariationPassword;
+				editText.InputType &= ~InputTypes.NumberVariationPassword;
+			if (textInput is IEntry entry)
+			{
+				if (entry.IsPassword)
+				{				
+					if (editText.InputType.HasFlag(InputTypes.ClassText))
+						editText.InputType |= InputTypes.TextVariationPassword;
+					if (editText.InputType.HasFlag(InputTypes.ClassNumber))
+						editText.InputType |= InputTypes.NumberVariationPassword;
+				}
+				else
+				{
+					editText.InputType &= ~InputTypes.TextVariationPassword;
+					editText.InputType &= ~InputTypes.NumberVariationPassword;
+				}
+			}
 
 			if (textInput is IEditor)
 				editText.InputType |= InputTypes.TextFlagMultiLine;
@@ -400,7 +419,7 @@
 			// If we implement the OnSelectionChanged method, this method is called after a keyboard layout change with SelectionStart = 0,
 			// Let's restore the cursor position to its previous location.
 			editText.SetSelection(previousCursorPosition);
 		}
 
 		internal static bool IsCompletedAction(this EditorActionEventArgs e, ImeAction currentInputImeFlag)
 		{