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

Commit c400482d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am bd51aaf9: Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii"" 

* commit 'bd51aaf9':
  Warn deprecated privateImeOptions, "nm" and "forceAscii"
parents 8da7bc67 bd51aaf9

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

+6 −4
Original line number Diff line number Diff line
@@ -244,9 +244,10 @@ public class KeyboardSet { 
        // TODO: Use InputMethodSubtype object as argument.

        public Builder setSubtype(Locale inputLocale, boolean asciiCapable,

                boolean touchPositionCorrectionEnabled) {

            final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(mParams.mImeOptions)

                    || Utils.inPrivateImeOptions(

            final boolean deprecatedForceAscii = Utils.inPrivateImeOptions(

                    mPackageName, LatinIME.IME_OPTION_FORCE_ASCII, mEditorInfo);

            final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(mParams.mImeOptions)

                    || deprecatedForceAscii;

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

            mParams.mTouchPositionCorrectionEnabled = touchPositionCorrectionEnabled;

            return this;
@@ -256,10 +257,11 @@ public class KeyboardSet { 
                boolean voiceKeyOnMain) {

            mParams.mSettingsKeyEnabled = settingsKeyEnabled;

            @SuppressWarnings("deprecation")

            final boolean deprecatedNoMicrophone = Utils.inPrivateImeOptions(

                    null, LatinIME.IME_OPTION_NO_MICROPHONE_COMPAT, mEditorInfo);

            final boolean noMicrophone = Utils.inPrivateImeOptions(

                    mPackageName, LatinIME.IME_OPTION_NO_MICROPHONE, mEditorInfo)

                    || Utils.inPrivateImeOptions(

                            null, LatinIME.IME_OPTION_NO_MICROPHONE_COMPAT, mEditorInfo);

                    || deprecatedNoMicrophone;

            mParams.mVoiceKeyEnabled = voiceKeyEnabled && !noMicrophone;

            mParams.mVoiceKeyOnMain = voiceKeyOnMain;

            return this;

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

+11 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
     */

    public static final String IME_OPTION_NO_SETTINGS_KEY = "noSettingsKey";



    // TODO: Remove this private option.

    /**

     * The private IME option used to indicate that the given text field needs

     * ASCII code points input.
@@ -729,6 +728,17 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                    : String.format("inputType=0x%08x imeOptions=0x%08x",

                            editorInfo.inputType, editorInfo.imeOptions)));

        }

        if (Utils.inPrivateImeOptions(null, IME_OPTION_NO_MICROPHONE_COMPAT, editorInfo)) {

            Log.w(TAG, "Deprecated private IME option specified: "

                    + editorInfo.privateImeOptions);

            Log.w(TAG, "Use " + getPackageName() + "." + IME_OPTION_NO_MICROPHONE + " instead");

        }

        if (Utils.inPrivateImeOptions(getPackageName(), IME_OPTION_FORCE_ASCII, editorInfo)) {

            Log.w(TAG, "Deprecated private IME option specified: "

                    + editorInfo.privateImeOptions);

            Log.w(TAG, "Use EditorInfo.IME_FLAG_FORCE_ASCII flag instead");

        }



        LatinImeLogger.onStartInputView(editorInfo);

        // In landscape mode, this method gets called without the input view being created.

        if (inputView == null) {