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

am 7ea58d31: Update enabled subtypes in the input method subtype enabler in "onResume"

Browse Source 
* commit '7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8':
  Update enabled subtypes in the input method subtype enabler in "onResume"
This commit is contained in:
satok
2011-10-17 11:38:57 -07:00
committed by Android Git Automerger
parent 400f48ab8a 7ea58d3164
commit 495bc81b5f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
View File

@@ -317,9 +317,9 @@ public class InputMethodAndSubtypeUtil {
}
}
setSubtypesPreferenceEnabled(context, inputMethodInfos, imiId, isEnabled);
updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes);
}
}
updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes);
}
public static void setSubtypesPreferenceEnabled(SettingsPreferenceFragment context,
@@ -346,7 +346,8 @@ public class InputMethodAndSubtypeUtil {
PreferenceScreen preferenceScreen = context.getPreferenceScreen();
for (InputMethodInfo imi : inputMethodProperties) {
String id = imi.getId();
HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id);
if (!enabledSubtypes.containsKey(id)) break;
final HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id);
final int subtypeCount = imi.getSubtypeCount();
for (int i = 0; i < subtypeCount; ++i) {
InputMethodSubtype subtype = imi.getSubtypeAt(i);

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

@@ -226,6 +226,7 @@ public class InputMethodPreference extends CheckBoxPreference
public void setChecked(boolean checked) {
super.setChecked(checked);
saveImeSettings();
updateSummary();
}
private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {