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

am f6f52a9a: am e43bc7ee: Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb

Browse Source 
* commit 'f6f52a9aa2c72539e5d9f2c1765cd45f8fa1fd88':
  Automatically turn on "Use system language" when no subtypes become selected Bug:  3327257
This commit is contained in:
satok
2011-01-12 01:21:54 -08:00
committed by Android Git Automerger
parent 35704b2a10 f6f52a9aa2
commit e8dbd2a9e0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
} else { } else {
InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled( InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
this, mInputMethodProperties, id, false); this, mInputMethodProperties, id, false);
updateAutoSelectionCB();
} }
} }
return super.onPreferenceTreeClick(preferenceScreen, preference); return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -247,7 +248,9 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
} }
private void setSubtypeAutoSelectionEnabled(String imiId, boolean autoSelectionEnabled) { private void setSubtypeAutoSelectionEnabled(String imiId, boolean autoSelectionEnabled) {
mSubtypeAutoSelectionCBMap.get(imiId).setChecked(autoSelectionEnabled); CheckBoxPreference autoSelectionCB = mSubtypeAutoSelectionCBMap.get(imiId);
if (autoSelectionCB == null) return;
autoSelectionCB.setChecked(autoSelectionEnabled);
final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId); final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId);
for (Preference subtypePref: subtypePrefs) { for (Preference subtypePref: subtypePrefs) {
if (subtypePref instanceof CheckBoxPreference) { if (subtypePref instanceof CheckBoxPreference) {