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

Commit 7bb75951 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by The Android Automerger
Browse files

Do not merge. Refresh "InputMethodPreference"s onResume 

Corresponding change is I015075d57ebed94d6b

Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
parent 290404d9

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

+22 −19
Original line number Diff line number Diff line
@@ -166,25 +166,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
            mKeyboardSettingsCategory.addPreference(currentIme);

        }



        synchronized (mInputMethodPreferenceList) {

            mInputMethodPreferenceList.clear();

            final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();

            final int N = (imis == null ? 0 : imis.size());

            for (int i = 0; i < N; ++i) {

                final InputMethodInfo imi = imis.get(i);

                final InputMethodPreference pref = getInputMethodPreference(imi);

                pref.setOnImePreferenceChangeListener(mOnImePreferenceChangedListener);

                mInputMethodPreferenceList.add(pref);

            }



            if (!mInputMethodPreferenceList.isEmpty()) {

                Collections.sort(mInputMethodPreferenceList);

                for (int i = 0; i < N; ++i) {

                    mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));

                }

            }

        }



        // Build hard keyboard and game controller preference categories.

        mIm = (InputManager)getActivity().getSystemService(Context.INPUT_SERVICE);

        updateInputDevices();
@@ -427,6 +408,28 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 


    private void updateInputMethodPreferenceViews() {

        synchronized (mInputMethodPreferenceList) {

            // Clear existing "InputMethodPreference"s

            for (final InputMethodPreference imp : mInputMethodPreferenceList) {

                mKeyboardSettingsCategory.removePreference(imp);

            }

            mInputMethodPreferenceList.clear();

            final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();

            final int N = (imis == null ? 0 : imis.size());

            for (int i = 0; i < N; ++i) {

                final InputMethodInfo imi = imis.get(i);

                final InputMethodPreference pref = getInputMethodPreference(imi);

                pref.setOnImePreferenceChangeListener(mOnImePreferenceChangedListener);

                mInputMethodPreferenceList.add(pref);

            }



            if (!mInputMethodPreferenceList.isEmpty()) {

                Collections.sort(mInputMethodPreferenceList);

                for (int i = 0; i < N; ++i) {

                    mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));

                }

            }



            // update views status

            for (Preference pref : mInputMethodPreferenceList) {

                if (pref instanceof InputMethodPreference) {

                    ((InputMethodPreference) pref).updatePreferenceViews();