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

Commit 129ca9e7 authored by Jean Chalard's avatar Jean Chalard
Browse files

[IL117] Simplification 

Change-Id: Id4d4f30ecdc80dd59543f90fe2525f4bcc5afb9d
parent cf122107

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

+12 −12
Original line number Original line Diff line number Diff line
@@ -1368,13 +1368,23 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    public void setSuggestedWords(final SuggestedWords suggestedWords,

    public void setSuggestedWords(final SuggestedWords suggestedWords,

            final boolean isSuggestionStripVisible) {

            final boolean isSuggestionStripVisible) {

        mInputLogic.setSuggestedWords(suggestedWords);

        mInputLogic.setSuggestedWords(suggestedWords);

        // TODO: Modify this when we support suggestions with hard keyboard

        if (!hasSuggestionStripView()) {

        if (!hasSuggestionStripView()) {

            return;

            return;

        }

        }

        mKeyboardSwitcher.onAutoCorrectionStateChanged(suggestedWords.mWillAutoCorrect);

        if (!onEvaluateInputViewShown()) {

            return;

        }

        if (!isSuggestionStripVisible) {

            mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);

            return;

        }

        mSuggestionStripView.setVisibility(View.VISIBLE);



        final SettingsValues currentSettings = mSettings.getCurrent();

        final SettingsValues currentSettings = mSettings.getCurrent();

        final boolean showSuggestions;

        final boolean showSuggestions;

        if (SuggestedWords.EMPTY == suggestedWords

        if (SuggestedWords.EMPTY == suggestedWords || suggestedWords.isPunctuationSuggestions()

                || suggestedWords.isPunctuationSuggestions()

                || !currentSettings.isSuggestionsRequested()) {

                || !currentSettings.isSuggestionsRequested()) {

            showSuggestions = !mSuggestionStripView.maybeShowImportantNoticeTitle(

            showSuggestions = !mSuggestionStripView.maybeShowImportantNoticeTitle(

                    currentSettings.mInputAttributes);

                    currentSettings.mInputAttributes);
@@ -1385,16 +1395,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            mSuggestionStripView.setSuggestions(suggestedWords,

            mSuggestionStripView.setSuggestions(suggestedWords,

                    SubtypeLocaleUtils.isRtlLanguage(mSubtypeSwitcher.getCurrentSubtype()));

                    SubtypeLocaleUtils.isRtlLanguage(mSubtypeSwitcher.getCurrentSubtype()));

        }

        }

        mKeyboardSwitcher.onAutoCorrectionStateChanged(suggestedWords.mWillAutoCorrect);

        // TODO: Modify this when we support suggestions with hard keyboard

        if (!onEvaluateInputViewShown() || !hasSuggestionStripView()) {

            return;

        }

        if (isSuggestionStripVisible) {

            mSuggestionStripView.setVisibility(View.VISIBLE);

        } else {

            mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);

        }

    }

    }





    // TODO[IL]: Move this out of LatinIME.

    // TODO[IL]: Move this out of LatinIME.