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

Commit 783f1932 authored by Jean Chalard's avatar Jean Chalard
Browse files

[QRP4] Simplification & small correctness fix. 

This fixes the color of the predictions when running
on a theme that has different colors for typed and
suggested words (GB theme).
Also, this is easier to understand and to modify from
now on.

Change-Id: Ifdc6d86a1695e83e16103041b06a2451f8d52cc4
parent a0984662

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

+6 −6
Original line number Diff line number Diff line
@@ -248,18 +248,18 @@ final class SuggestionStripLayoutHelper { 
            final int indexInSuggestedWords) {

        final int positionInStrip =

                getPositionInSuggestionStrip(indexInSuggestedWords, suggestedWords);

        // TODO: Need to revisit this logic with bigram suggestions

        final boolean isSuggested = (indexInSuggestedWords != SuggestedWords.INDEX_OF_TYPED_WORD);

        final boolean isTypedWord = !suggestedWords.mIsPrediction

                && (indexInSuggestedWords == SuggestedWords.INDEX_OF_TYPED_WORD);



        final int color;

        if (positionInStrip == mCenterPositionInStrip && suggestedWords.mWillAutoCorrect) {

            color = mColorAutoCorrect;

        } else if (positionInStrip == mCenterPositionInStrip && suggestedWords.mTypedWordValid) {

            color = mColorValidTypedWord;

        } else if (isSuggested) {

            color = mColorSuggested;

        } else {

        } else if (isTypedWord) {

            color = mColorTypedWord;

        } else {

            color = mColorSuggested;

        }

        if (LatinImeLogger.sDBG && suggestedWords.size() > 1) {

            // If we auto-correct, then the autocorrection is in slot 0 and the typed word
@@ -272,7 +272,7 @@ final class SuggestionStripLayoutHelper { 
            }

        }



        if (suggestedWords.mIsObsoleteSuggestions && isSuggested) {

        if (suggestedWords.mIsObsoleteSuggestions && !isTypedWord) {

            return applyAlpha(color, mAlphaObsoleted);

        }

        return color;