Commit 186022c3 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

[Project Code Inclusion] Remove use of blacklist

Replace !isKeyboardBlacklisted() with doesKeyboardSupportAutocomplete().

Bug: 1149550
Change-Id: I244f1966ad7d6e54e0435c09cdf906c9b044549a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541402Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827899}
parent 280a3b3f
......@@ -360,16 +360,16 @@ public class SpannableAutocompleteEditTextModel implements AutocompleteEditTextM
@Override
public boolean shouldAutocomplete() {
boolean retVal = mBatchEditNestCount == 0 && mLastEditWasTyping
&& mCurrentState.isCursorAtEndOfUserText() && !isKeyboardBlacklisted()
&& mCurrentState.isCursorAtEndOfUserText() && doesKeyboardSupportAutocomplete()
&& isNonCompositionalText(getTextWithoutAutocomplete());
if (DEBUG) Log.i(TAG, "shouldAutocomplete: " + retVal);
return retVal;
}
private boolean isKeyboardBlacklisted() {
private boolean doesKeyboardSupportAutocomplete() {
String pkgName = mDelegate.getKeyboardPackageName();
return pkgName.contains(".iqqi") // crbug.com/767016
|| pkgName.contains("omronsoft") || pkgName.contains(".iwnn"); // crbug.com/758443
return !pkgName.contains(".iqqi") // crbug.com/767016
&& !pkgName.contains("omronsoft") && !pkgName.contains(".iwnn"); // crbug.com/758443
}
private boolean shouldFinishCompositionOnDeletion() {
......@@ -379,7 +379,7 @@ public class SpannableAutocompleteEditTextModel implements AutocompleteEditTextM
// states.
String pkgName = mDelegate.getKeyboardPackageName();
// One exception is the recent version of Samsung keyboard which works goofily only
// when we finish composing text here. Since it is more difficult to blacklist all Japanese
// when we finish composing text here. Since it is more difficult to block all Japanese
// keyboards, instead we call finishComposingText() for all the keyboards except for Samsung
// keyboard.
return !pkgName.contains("com.sec.android.inputmethod")
......
......@@ -1224,7 +1224,7 @@ public class AutocompleteEditTextTest {
@Test
@EnableFeatures(ChromeFeatureList.SPANNABLE_INLINE_AUTOCOMPLETE)
public void testBlacklistWithSpannableModel() {
public void testUnsupportedKeyboardWithSpannableModel() {
mAutocomplete.setKeyboardPackageName("jp.co.sharp.android.iwnn");
// User types "h".
assertTrue(mInputConnection.commitText("h", 1));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment