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

Commit 7d57fc24 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Clean up for Iba6eeb7981634e7ddb. 

Bug: 15298959
Change-Id: I6921db77b7d231ad3aad99d4c380ae2ed6bbf540
parent 7a4f9b67

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

+8 −8
Original line number Diff line number Diff line
@@ -318,18 +318,18 @@ public final class BinaryDictionary extends Dictionary { 
                ++len;

            }

            if (len > 0) {

                final int kindAndFlags = mOutputTypes[j];

                if (blockOffensiveWords

                        && 0 != (kindAndFlags & SuggestedWordInfo.KIND_FLAG_POSSIBLY_OFFENSIVE)

                        && 0 == (kindAndFlags & SuggestedWordInfo.KIND_FLAG_EXACT_MATCH)) {

                final SuggestedWordInfo suggestedWordInfo =

                        new SuggestedWordInfo(new String(mOutputCodePoints, start, len),

                                mOutputScores[j], mOutputTypes[j], this /* sourceDict */,

                                mSpaceIndices[j] /* indexOfTouchPointOfSecondWord */,

                                mOutputAutoCommitFirstWordConfidence[0]);

                if (blockOffensiveWords && suggestedWordInfo.isPossiblyOffensive()

                        && !suggestedWordInfo.isExactMatch()) {

                    // If we block potentially offensive words, and if the word is possibly

                    // offensive, then we don't output it unless it's also an exact match.

                    continue;

                }

                suggestions.add(new SuggestedWordInfo(new String(mOutputCodePoints, start, len),

                        mOutputScores[j], kindAndFlags, this /* sourceDict */,

                        mSpaceIndices[j] /* indexOfTouchPointOfSecondWord */,

                        mOutputAutoCommitFirstWordConfidence[0]));

                suggestions.add(suggestedWordInfo);

            }

        }

        return suggestions;

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

+3 −4
Original line number Diff line number Diff line
@@ -296,16 +296,15 @@ public class SuggestedWords { 
        }



        public boolean isPossiblyOffensive() {

            return (mKindAndFlags & SuggestedWordInfo.KIND_FLAG_POSSIBLY_OFFENSIVE) != 0;

            return (mKindAndFlags & KIND_FLAG_POSSIBLY_OFFENSIVE) != 0;

        }



        public boolean isExactMatch() {

            return (mKindAndFlags & SuggestedWordInfo.KIND_FLAG_EXACT_MATCH) != 0;

            return (mKindAndFlags & KIND_FLAG_EXACT_MATCH) != 0;

        }



        public boolean isExactMatchWithIntentionalOmission() {

            return (mKindAndFlags

                    & SuggestedWordInfo.KIND_FLAG_EXACT_MATCH_WITH_INTENTIONAL_OMISSION) != 0;

            return (mKindAndFlags & KIND_FLAG_EXACT_MATCH_WITH_INTENTIONAL_OMISSION) != 0;

        }



        public void setDebugString(final String str) {