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

Commit 59bc6e03 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Delete unused code from IMMS and its utility library. 

This CL changes nothing except for deleting unused code and
methods from InputMethodManagerService and InputMethodUtils.

No behavior change is expected.

Bug: 22285167
Change-Id: I3bd814c8b5892b4ef28d6d5622014463df8f1c2b
parent 012d014c

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+0 −24
Original line number Diff line number Diff line
@@ -878,12 +878,6 @@ public class InputMethodUtils { 
                    getEnabledInputMethodsAndSubtypeListLocked());

        }



        public List<Pair<InputMethodInfo, ArrayList<String>>>

                getEnabledInputMethodAndSubtypeHashCodeListLocked() {

            return createEnabledInputMethodAndSubtypeHashCodeListLocked(

                    getEnabledInputMethodsAndSubtypeListLocked());

        }



        public List<InputMethodSubtype> getEnabledInputMethodSubtypeListLocked(

                Context context, InputMethodInfo imi, boolean allowsImplicitlySelectedSubtypes) {

            List<InputMethodSubtype> enabledSubtypes =
@@ -998,19 +992,6 @@ public class InputMethodUtils { 
            return res;

        }



        private List<Pair<InputMethodInfo, ArrayList<String>>>

                createEnabledInputMethodAndSubtypeHashCodeListLocked(

                        List<Pair<String, ArrayList<String>>> imsList) {

            final ArrayList<Pair<InputMethodInfo, ArrayList<String>>> res = new ArrayList<>();

            for (Pair<String, ArrayList<String>> ims : imsList) {

                InputMethodInfo info = mMethodMap.get(ims.first);

                if (info != null) {

                    res.add(new Pair<>(info, ims.second));

                }

            }

            return res;

        }



        private void putEnabledInputMethodsStr(String str) {

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.ENABLED_INPUT_METHODS, str, mCurrentUserId);
@@ -1225,11 +1206,6 @@ public class InputMethodUtils { 
                    subtypeId, mCurrentUserId);

        }



        public String getDisabledSystemInputMethods() {

            return Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.DISABLED_SYSTEM_INPUT_METHODS, mCurrentUserId);

        }



        public String getSelectedInputMethod() {

            if (DEBUG) {

                Slog.d(TAG, "getSelectedInputMethodStr: " + Settings.Secure.getStringForUser(

services/core/java/com/android/server/InputMethodManagerService.java

+0 −13
Original line number Diff line number Diff line
@@ -2892,8 +2892,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        // Use for queryIntentServicesAsUser

        final PackageManager pm = mContext.getPackageManager();

        String disabledSysImes = mSettings.getDisabledSystemInputMethods();

        if (disabledSysImes == null) disabledSysImes = "";



        final List<ResolveInfo> services = pm.queryIntentServicesAsUser(

                new Intent(InputMethod.SERVICE_INTERFACE),
@@ -3461,17 +3459,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        return mCurrentSubtype;

    }



    private void addShortcutInputMethodAndSubtypes(InputMethodInfo imi,

            InputMethodSubtype subtype) {

        if (mShortcutInputMethodsAndSubtypes.containsKey(imi)) {

            mShortcutInputMethodsAndSubtypes.get(imi).add(subtype);

        } else {

            ArrayList<InputMethodSubtype> subtypes = new ArrayList<>();

            subtypes.add(subtype);

            mShortcutInputMethodsAndSubtypes.put(imi, subtypes);

        }

    }



    // TODO: We should change the return type from List to List<Parcelable>

    @SuppressWarnings("rawtypes")

    @Override