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

Commit 2d25ba27 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Omit InputMethodManagerCompatWrapper argument from some utility methods 

Change-Id: Ic837018c702c8c575de3e5e81fe8e31fee16fe22
parent 508ded58

java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java

+2 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class InputMethodManagerCompatWrapper { 
    private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() {

        if (TextUtils.isEmpty(mLatinImePackageName))

            return null;

        return Utils.getInputMethodInfo(this, mLatinImePackageName);

        return Utils.getInputMethodInfo(mLatinImePackageName);

    }



    private static InputMethodSubtypeCompatWrapper getLastResortSubtype(String mode) {
@@ -239,8 +239,7 @@ public class InputMethodManagerCompatWrapper { 


        // The code below are based on {@link InputMethodManager#showInputMethodMenuInternal}.



        final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo(

                this, mLatinImePackageName);

        final InputMethodInfoCompatWrapper myImi = Utils.getInputMethodInfo(mLatinImePackageName);

        final List<InputMethodSubtypeCompatWrapper> myImsList = getEnabledInputMethodSubtypeList(

                myImi, true);

        final InputMethodSubtypeCompatWrapper currentIms = getCurrentInputMethodSubtype();

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

+1 −1
Original line number Diff line number Diff line
@@ -2419,7 +2419,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
                switch (position) {

                case 0:

                    Intent intent = CompatUtils.getInputLanguageSelectionIntent(

                            Utils.getInputMethodId(mImm, getPackageName()),

                            Utils.getInputMethodId(getPackageName()),

                            Intent.FLAG_ACTIVITY_NEW_TASK

                            | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

                            | Intent.FLAG_ACTIVITY_CLEAR_TOP);

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

+3 −4
Original line number Diff line number Diff line
@@ -329,10 +329,9 @@ public class Settings extends InputMethodSettingsActivity 
    @Override

    public boolean onPreferenceClick(Preference pref) {

        if (pref == mInputLanguageSelection) {

            startActivity(CompatUtils.getInputLanguageSelectionIntent(

                    Utils.getInputMethodId(

                            InputMethodManagerCompatWrapper.getInstance(),

                            getActivityInternal().getApplicationInfo().packageName), 0));

            final String imeId = Utils.getInputMethodId(

                    getActivityInternal().getApplicationInfo().packageName);

            startActivity(CompatUtils.getInputLanguageSelectionIntent(imeId, 0));

            return true;

        }

        return false;

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

+8 −4
Original line number Diff line number Diff line
@@ -171,12 +171,16 @@ public class Utils { 
        return keyboardCount > 1;

    }



    public static String getInputMethodId(InputMethodManagerCompatWrapper imm, String packageName) {

        return getInputMethodInfo(imm, packageName).getId();

    public static String getInputMethodId(String packageName) {

        return getInputMethodInfo(packageName).getId();

    }



    public static InputMethodInfoCompatWrapper getInputMethodInfo(String packageName) {

        final InputMethodManagerCompatWrapper imm = InputMethodManagerCompatWrapper.getInstance();

        if (imm == null) {

            throw new RuntimeException("Input method manager not found");

        }



    public static InputMethodInfoCompatWrapper getInputMethodInfo(

            InputMethodManagerCompatWrapper imm, String packageName) {

        for (final InputMethodInfoCompatWrapper imi : imm.getEnabledInputMethodList()) {

            if (imi.getPackageName().equals(packageName))

                return imi;