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

Commit 8a711f2a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove unneeded Context argument 

Change-Id: Ib34931836a617d0dc049fb3c9ae6686374ec8c12
parent 4195567d

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

+4 −5
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public class RichInputMethodManager { 


        // Initialize additional subtypes.

        SubtypeLocaleUtils.init(context);

        final InputMethodSubtype[] additionalSubtypes = getAdditionalSubtypes(context);

        final InputMethodSubtype[] additionalSubtypes = getAdditionalSubtypes();

        setAdditionalInputMethodSubtypes(additionalSubtypes);



        final ConnectivityManager connectivityManager =
@@ -119,11 +119,10 @@ public class RichInputMethodManager { 
        mIsNetworkConnected = (info != null && info.isConnected());

    }



    public InputMethodSubtype[] getAdditionalSubtypes(final Context context) {

        SubtypeLocaleUtils.init(context);

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

    public InputMethodSubtype[] getAdditionalSubtypes() {

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);

        final String prefAdditionalSubtypes = Settings.readPrefAdditionalSubtypes(

                prefs, context.getResources());

                prefs, mContext.getResources());

        return AdditionalSubtypeUtils.createAdditionalSubtypesArray(prefAdditionalSubtypes);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver { 
            // subtypes when the package is replaced.

            RichInputMethodManager.init(context);

            final RichInputMethodManager richImm = RichInputMethodManager.getInstance();

            final InputMethodSubtype[] additionalSubtypes = richImm.getAdditionalSubtypes(context);

            final InputMethodSubtype[] additionalSubtypes = richImm.getAdditionalSubtypes();

            richImm.setAdditionalInputMethodSubtypes(additionalSubtypes);

            LauncherIconVisibilityManager.updateSetupWizardIconVisibility(context);

        } else if (Intent.ACTION_BOOT_COMPLETED.equals(intentAction)) {

tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { 
        mRichImm = RichInputMethodManager.getInstance();



        // Save and reset additional subtypes preference.

        mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes(context);

        mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes();

        final InputMethodSubtype[] predefinedAdditionalSubtypes =

                AdditionalSubtypeUtils.createAdditionalSubtypesArray(

                        AdditionalSubtypeUtils.createPrefSubtypes(

tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class RichInputMethodSubtypeTests extends AndroidTestCase { 
        mRichImm = RichInputMethodManager.getInstance();



        // Save and reset additional subtypes

        mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context);

        mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes();

        final InputMethodSubtype[] predefinedAddtionalSubtypes =

                AdditionalSubtypeUtils.createAdditionalSubtypesArray(

                        AdditionalSubtypeUtils.createPrefSubtypes(

tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { 
        mRichImm = RichInputMethodManager.getInstance();



        // Save and reset additional subtypes

        mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context);

        mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes();

        final InputMethodSubtype[] predefinedAddtionalSubtypes =

                AdditionalSubtypeUtils.createAdditionalSubtypesArray(

                        AdditionalSubtypeUtils.createPrefSubtypes(