PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I34e1cefc34f737ecf1e4b13bf3a8839e7e3a4bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-21 04:20:49 +00:00
committed by Automerger Merge Worker
parent 65fa36ef25 8a2a127435
commit 1e4c05ef7c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/inputmethod/SpellCheckerPreference.java
View File

@@ -47,6 +47,9 @@ class SpellCheckerPreference extends CustomListPreference {
super(context, null); super(context, null);
mScis = scis; mScis = scis;
setWidgetLayoutResource(R.layout.preference_widget_gear); setWidgetLayoutResource(R.layout.preference_widget_gear);
if (scis == null) {
return;
}
CharSequence[] labels = new CharSequence[scis.length]; CharSequence[] labels = new CharSequence[scis.length];
CharSequence[] values = new CharSequence[scis.length]; CharSequence[] values = new CharSequence[scis.length];
for (int i = 0 ; i < scis.length; i++) { for (int i = 0 ; i < scis.length; i++) {

1
src/com/android/settings/inputmethod/SpellCheckersSettings.java
View File

@@ -133,6 +133,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
if (preference instanceof SpellCheckerPreference) { if (preference instanceof SpellCheckerPreference) {
final SpellCheckerPreference pref = (SpellCheckerPreference) preference; final SpellCheckerPreference pref = (SpellCheckerPreference) preference;
pref.setSelected(mCurrentSci); pref.setSelected(mCurrentSci);
pref.setEnabled(mEnabledScis != null);
} }
} }
mSpellCheckerLanaguagePref.setEnabled(isSpellCheckerEnabled && mCurrentSci != null); mSpellCheckerLanaguagePref.setEnabled(isSpellCheckerEnabled && mCurrentSci != null);