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

Commit 144f0b8f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056



Change-Id: I21dd16316a3db910b91207ed327315c43f64b8bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8600c402 e4f376f7

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

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ class SpellCheckerPreference extends CustomListPreference { 
        super(context, null);

        mScis = scis;

        setWidgetLayoutResource(R.layout.preference_widget_gear);

        if (scis == null) {

            return;

        }

        CharSequence[] labels = new CharSequence[scis.length];

        CharSequence[] values = new CharSequence[scis.length];

        for (int i = 0 ; i < scis.length; i++) {

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment 
            if (preference instanceof SpellCheckerPreference) {

                final SpellCheckerPreference pref = (SpellCheckerPreference) preference;

                pref.setSelected(mCurrentSci);

                pref.setEnabled(mEnabledScis != null);

            }

        }

        mSpellCheckerLanaguagePref.setEnabled(isSpellCheckerEnabled && mCurrentSci != null);