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

Commit 0142b997 authored by satok's avatar satok
Browse files

Do not set "SuggestionSpan"s for suggestions from the next word predicition 

Bug: 6294817
Change-Id: I5010eafa5ba7e947743706adf7e722f4f0cfb415
parent d7889d0f

java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class SuggestionSpanUtils { 
        if (!dictionaryAvailable || TextUtils.isEmpty(pickedWord)

                || CONSTRUCTOR_SuggestionSpan == null

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

                || suggestedWords.mIsPrediction || suggestedWords.mIsPunctuationSuggestions

                || OBJ_SUGGESTIONS_MAX_SIZE == null) {

            return pickedWord;

        }

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

+4 −2
Original line number Diff line number Diff line
@@ -877,7 +877,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                    false /* hasAutoCorrectionCandidate */,

                    false /* allowsToBeAutoCorrected */,

                    false /* isPunctuationSuggestions */,

                    false /* isObsoleteSuggestions */);

                    false /* isObsoleteSuggestions */,

                    false /* isPrediction */);

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

            final boolean isAutoCorrection = false;

            setSuggestions(suggestedWords, isAutoCorrection);
@@ -1772,7 +1773,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                            false /* hasAutoCorrectionCandidate */,

                            false /* allowsToBeAutoCorrected */,

                            false /* isPunctuationSuggestions */,

                            true /* isObsoleteSuggestions */);

                            true /* isObsoleteSuggestions */,

                            false /* isPrediction */);

            showSuggestions(obsoleteSuggestedWords, typedWord);

        }

    }

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

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

                false /* allowsToBeAutoCorrected */,

                true /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

                false /* isObsoleteSuggestions */,

                false /* isPrediction */);

    }



    private static String createWordSeparators(final String weakSpaceStrippers,

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

+5 −5
Original line number Diff line number Diff line
@@ -253,13 +253,12 @@ public class Suggest implements Dictionary.WordCallback { 
        SuggestedWordInfo.removeDups(mSuggestions);



        return new SuggestedWords(mSuggestions,

                // TODO: Just assuming the suggestions that came from the bigram prediction are

                // valid now. Need to assign a correct value for typedWordValid.

                true /* typedWordValid */,

                false /* typedWordValid */,

                false /* hasAutoCorrectionCandidate */,

                false /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

                false /* isObsoleteSuggestions */,

                true /* isPrediction */);

    }



    // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -396,7 +395,8 @@ public class Suggest implements Dictionary.WordCallback { 
                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,

                allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,

                false /* isPunctuationSuggestions */,

                false /* isObsoleteSuggestions */);

                false /* isObsoleteSuggestions */,

                false /* isPrediction */);

    }



    /**

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

+5 −2
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ import java.util.HashSet; 


public class SuggestedWords {

    public static final SuggestedWords EMPTY = new SuggestedWords(

            new ArrayList<SuggestedWordInfo>(0), false, false, false, false, false);

            new ArrayList<SuggestedWordInfo>(0), false, 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;

    public final boolean mIsPrediction;

    private final ArrayList<SuggestedWordInfo> mSuggestedWordInfoList;



    public SuggestedWords(final ArrayList<SuggestedWordInfo> suggestedWordInfoList,
@@ -39,13 +40,15 @@ public class SuggestedWords { 
            final boolean hasAutoCorrectionCandidate,

            final boolean allowsToBeAutoCorrected,

            final boolean isPunctuationSuggestions,

            final boolean isObsoleteSuggestions) {

            final boolean isObsoleteSuggestions,

            final boolean isPrediction) {

        mSuggestedWordInfoList = suggestedWordInfoList;

        mTypedWordValid = typedWordValid;

        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;

        mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;

        mIsPunctuationSuggestions = isPunctuationSuggestions;

        mIsObsoleteSuggestions = isObsoleteSuggestions;

        mIsPrediction = isPrediction;

    }



    public int size() {