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

Commit 42a7e478 authored by Pingzhi Wang's avatar Pingzhi Wang Committed by David Magno
Browse files

Fix crash when clicking Spell Checker 

Some variants do not have the default Spell Checker (GBoard)
pre-installed (typically Mainland China variants). Disable the
Spell Checker settings for such variants, to avoid crashes.

Bug: 310751714
Test: Manual
Change-Id: I1fb5a9959cffd26f3921e32226605a38636871b6
parent 6a04355c

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);