From 192c7fcca48fe65e1c9302fd2b9a5fe32e9287bf Mon Sep 17 00:00:00 2001 From: Aleksandras Kostarevas Date: Tue, 17 Oct 2023 20:34:13 +0300 Subject: [PATCH] Update logic to suppress suggestions/autocorrect --- .../inputmethod/latin/InputAttributes.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/java/src/org/futo/inputmethod/latin/InputAttributes.java b/java/src/org/futo/inputmethod/latin/InputAttributes.java index 4630dddb0..20f34133c 100644 --- a/java/src/org/futo/inputmethod/latin/InputAttributes.java +++ b/java/src/org/futo/inputmethod/latin/InputAttributes.java @@ -102,10 +102,10 @@ public final class InputAttributes { // TODO: Have a helper method in InputTypeUtils // Make sure that passwords are not displayed in {@link SuggestionStripView}. final boolean shouldSuppressSuggestions = mIsPasswordField - || InputTypeUtils.isEmailVariation(variation) - || InputType.TYPE_TEXT_VARIATION_URI == variation - || InputType.TYPE_TEXT_VARIATION_FILTER == variation - || flagNoSuggestions + //|| InputTypeUtils.isEmailVariation(variation) + //|| InputType.TYPE_TEXT_VARIATION_URI == variation + //|| InputType.TYPE_TEXT_VARIATION_FILTER == variation + //|| flagNoSuggestions || flagAutoComplete; mShouldShowSuggestions = !shouldSuppressSuggestions; @@ -120,14 +120,22 @@ public final class InputAttributes { mDisableGestureFloatingPreviewText = InputAttributes.inPrivateImeOptions( mPackageNameForPrivateImeOptions, NO_FLOATING_GESTURE_PREVIEW, editorInfo); + // TODO: This may need adjustment + mInputTypeNoAutoCorrect = shouldSuppressSuggestions + || (variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT && !flagAutoCorrect) + || InputTypeUtils.isEmailVariation(variation) + || InputType.TYPE_TEXT_VARIATION_URI == variation + || InputType.TYPE_TEXT_VARIATION_FILTER == variation + || flagNoSuggestions; + // If it's a browser edit field and auto correct is not ON explicitly, then // disable auto correction, but keep suggestions on. // If NO_SUGGESTIONS is set, don't do prediction. // If it's not multiline and the autoCorrect flag is not set, then don't correct - mInputTypeNoAutoCorrect = - (variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT && !flagAutoCorrect) - || flagNoSuggestions - || (!flagAutoCorrect && !flagMultiLine); + //mInputTypeNoAutoCorrect = + // (variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT && !flagAutoCorrect) + // || flagNoSuggestions + // || (!flagAutoCorrect && !flagMultiLine); mApplicationSpecifiedCompletionOn = flagAutoComplete && isFullscreenMode;