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

Commit 03a35170 authored by Jean Chalard's avatar Jean Chalard
Browse files

Add info for obsolete suggestions in SuggestedWords 

Change-Id: I9684c7b08244b34853ce8a99b6e9d885389f6687
parent 5f959359

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

+4 −2
Original line number Diff line number Diff line
@@ -931,7 +931,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                    false /* typedWordValid */,

                    false /* hasAutoCorrectionCandidate */,

                    false /* allowsToBeAutoCorrected */,

                    false /* isPunctuationSuggestions */);

                    false /* isPunctuationSuggestions */,

                    false /* isObsoleteSuggestions */);

            // When in fullscreen mode, show completions generated by the application

            final boolean isAutoCorrection = false;

            setSuggestions(suggestedWords, isAutoCorrection);
@@ -1793,7 +1794,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                            false /* typedWordValid */,

                            false /* hasAutoCorrectionCandidate */,

                            false /* allowsToBeAutoCorrected */,

                            false /* isPunctuationSuggestions */);

                            false /* isPunctuationSuggestions */,

                            true /* isObsoleteSuggestions */);

            showSuggestions(obsoleteSuggestedWords, typedWord);

        }

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ public class SettingsValues { 
                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */);

                true /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

    }



    private static String createWordSeparators(final String weakSpaceStrippers,

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

+4 −2
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ public class Suggest implements Dictionary.WordCallback { 
                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */);

                false /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

    }



    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -413,7 +414,8 @@ public class Suggest implements Dictionary.WordCallback { 
                !allowsToBeAutoCorrected /* typedWordValid */,

                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,

                allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */);

                false /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

    }



    // This assumes the scores[] array is at least as long as suggestions.size() - 1.

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

+5 −2
Original line number Diff line number Diff line
@@ -27,24 +27,27 @@ import java.util.List; 


public class SuggestedWords {

    public static final SuggestedWords EMPTY = new SuggestedWords(

            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);

            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);



    public final boolean mTypedWordValid;

    public final boolean mHasAutoCorrectionCandidate;

    public final boolean mIsPunctuationSuggestions;

    public final boolean mAllowsToBeAutoCorrected;

    public final boolean mIsObsoleteSuggestions;

    private final List<SuggestedWordInfo> mSuggestedWordInfoList;



    public SuggestedWords(final List<SuggestedWordInfo> suggestedWordInfoList,

            final boolean typedWordValid,

            final boolean hasAutoCorrectionCandidate,

            final boolean allowsToBeAutoCorrected,

            final boolean isPunctuationSuggestions) {

            final boolean isPunctuationSuggestions,

            final boolean isObsoleteSuggestions) {

        mSuggestedWordInfoList = suggestedWordInfoList;

        mTypedWordValid = typedWordValid;

        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;

        mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;

        mIsPunctuationSuggestions = isPunctuationSuggestions;

        mIsObsoleteSuggestions = isObsoleteSuggestions;

    }



    public int size() {