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

Commit c7e43a7a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use language agnostic QWERTY for forceAscii"

parents 234bf612 32bfc160

java/src/com/android/inputmethod/keyboard/KeyboardSet.java

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.inputmethod.latin.LatinImeLogger; 
import com.android.inputmethod.latin.LocaleUtils.RunInLocale;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.StringUtils;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.XmlParseUtils;



import org.xmlpull.v1.XmlPullParser;
@@ -247,7 +248,8 @@ public class KeyboardSet { 
            final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(

                    mParams.mEditorInfo.imeOptions)

                    || deprecatedForceAscii;

            mParams.mLocale = (forceAscii && !asciiCapable) ? Locale.US : inputLocale;

            mParams.mLocale = (forceAscii && !asciiCapable)

                    ? SubtypeLocale.LOCALE_NO_LANGUAGE_QWERTY : inputLocale;

            return this;

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ public class SubtypeSwitcher { 
    }



    public boolean needsToDisplayLanguage(Locale keyboardLocale) {

        if (keyboardLocale.equals(SubtypeLocale.LOCALE_NO_LANGUAGE_QWERTY)) {

            return true;

        }

        if (!keyboardLocale.equals(mInputLocale)) {

            return false;

        }