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

Commit 7215e06e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove redundant EditorInfo member from KeyboardLayoutSet.Builder 

Change-Id: I9bbba9c27d3d478421c094e6cd0e1da31fd4f4c8
parent 4a2f6a22

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

+4 −6
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ public final class KeyboardLayoutSet { 
        private final Context mContext;

        private final String mPackageName;

        private final Resources mResources;

        private final EditorInfo mEditorInfo;



        private final Params mParams = new Params();
@@ -223,13 +222,12 @@ public final class KeyboardLayoutSet { 
            mContext = context;

            mPackageName = context.getPackageName();

            mResources = context.getResources();

            mEditorInfo = editorInfo;

            final Params params = mParams;



            params.mMode = getKeyboardMode(editorInfo);

            params.mEditorInfo = (editorInfo != null) ? editorInfo : EMPTY_EDITOR_INFO;

            params.mNoSettingsKey = InputAttributes.inPrivateImeOptions(

                    mPackageName, NO_SETTINGS_KEY, mEditorInfo);

                    mPackageName, NO_SETTINGS_KEY, params.mEditorInfo);

        }



        public Builder setKeyboardGeometry(final int keyboardWidth, final int keyboardHeight) {
@@ -242,7 +240,7 @@ public final class KeyboardLayoutSet { 
            final boolean asciiCapable = subtype.containsExtraValueKey(ASCII_CAPABLE);

            @SuppressWarnings("deprecation")

            final boolean deprecatedForceAscii = InputAttributes.inPrivateImeOptions(

                    mPackageName, FORCE_ASCII, mEditorInfo);

                    mPackageName, FORCE_ASCII, mParams.mEditorInfo);

            final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(

                    mParams.mEditorInfo.imeOptions)

                    || deprecatedForceAscii;
@@ -264,9 +262,9 @@ public final class KeyboardLayoutSet { 
                final boolean languageSwitchKeyEnabled) {

            @SuppressWarnings("deprecation")

            final boolean deprecatedNoMicrophone = InputAttributes.inPrivateImeOptions(

                    null, NO_MICROPHONE_COMPAT, mEditorInfo);

                    null, NO_MICROPHONE_COMPAT, mParams.mEditorInfo);

            final boolean noMicrophone = InputAttributes.inPrivateImeOptions(

                    mPackageName, NO_MICROPHONE, mEditorInfo)

                    mPackageName, NO_MICROPHONE, mParams.mEditorInfo)

                    || deprecatedNoMicrophone;

            mParams.mVoiceKeyEnabled = voiceKeyEnabled && !noMicrophone;

            mParams.mVoiceKeyOnMain = voiceKeyOnMain;