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

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

Change-Id: Idb4ebe7592c2bdf2685fb20c95b57c20565c0dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-21 03:49:50 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 0 deletions

View File

@@ -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++) {

View File

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