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

Commit c98a943e authored by satok's avatar satok
Browse files

Duplicate enabled languages when there is only one enabled language 

Bug: 3415274

Change-Id: Ibc17733be888044cfa5d1787b8489e642d70d70f
parent f5cf266a

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

+8 −1
Original line number Diff line number Diff line
@@ -426,8 +426,15 @@ public class SubtypeSwitcher { 
        if (mConfigUseSpacebarLanguageSwitcher) {

            return mLanguageSwitcher.getEnabledLanguages();

        } else {

            int enabledLanguageCount = mEnabledLanguagesOfCurrentInputMethod.size();

            // Workaround for explicitly specifying the voice language

            if (enabledLanguageCount == 1) {

                mEnabledLanguagesOfCurrentInputMethod.add(

                        mEnabledLanguagesOfCurrentInputMethod.get(0));

                ++enabledLanguageCount;

            }

            return mEnabledLanguagesOfCurrentInputMethod.toArray(

                    new String[mEnabledLanguagesOfCurrentInputMethod.size()]);

                    new String[enabledLanguageCount]);

        }

    }

java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { 
    private static final int RECOGNITIONVIEW_HEIGHT_THRESHOLD_RATIO = 6;



    private static final String TAG = VoiceIMEConnector.class.getSimpleName();

    private static boolean DEBUG = LatinImeLogger.sDBG;

    private static final boolean DEBUG = LatinImeLogger.sDBG;



    private boolean mAfterVoiceInput;

    private boolean mHasUsedVoiceInput;
@@ -715,7 +715,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { 
        mHandler.updateVoiceResults();

    }



    public FieldContext makeFieldContext() {

    private FieldContext makeFieldContext() {

        SubtypeSwitcher switcher = SubtypeSwitcher.getInstance();

        return new FieldContext(mService.getCurrentInputConnection(),

                mService.getCurrentInputEditorInfo(), switcher.getInputLocaleStr(),