diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-21 03:49:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 03:49:50 +0000 |
| commit | 8a2a127435f0c7926b2394c44f91e2254404918f (patch) | |
| tree | 0c37e27ec32325041a87211cb9d2472d54b551a7 | |
| parent | bcefa0a8c49cf1676a9d8c91715c1f6f3af99808 (diff) | |
| parent | e4f376f7ef302a91665fa27dbab2c1ce6808081c (diff) | |
| download | Settings-8a2a127435f0c7926b2394c44f91e2254404918f.tar.gz | |
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>
| -rw-r--r-- | src/com/android/settings/inputmethod/SpellCheckerPreference.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/SpellCheckersSettings.java | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 116f1c7b186..8c8942a00c6 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -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++) { diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 99f7a4e9435..fcba4732483 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -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); |