Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be82f297 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 7cbd0478: Merge "Do not display punctuation suggestions when bigrams are on." into jb-dev 

* commit '7cbd0478':
  Do not display punctuation suggestions when bigrams are on.
parents 42ecf39d 7cbd0478

java/src/com/android/inputmethod/latin/LatinIME.java

+6 −2
Original line number Diff line number Diff line
@@ -2053,12 +2053,16 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            // showSuggestions will retrieve the word near the cursor, we don't want that here)

            showSuggestions(suggestedWords, "");

        } else {

            if (!isShowingPunctuationList()) setPunctuationSuggestions();

            clearSuggestions();

        }

    }



    public void setPunctuationSuggestions() {

        if (mSettingsValues.mBigramPredictionEnabled) {

            clearSuggestions();

        } else {

            setSuggestions(mSettingsValues.mSuggestPuncList, false);

        }

        setAutoCorrectionIndicator(false);

        setSuggestionStripShown(isSuggestionsStripVisible());

    }

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, 
    }



    public void setSuggestions(SuggestedWords suggestedWords) {

        if (suggestedWords == null || suggestedWords.size() == 0)

        if (suggestedWords == null)

            return;



        clear();