am f2d812a5: Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb

* commit 'f2d812a5d49af75ff796377a23048900f9eef11f':
  Disable the checkbox even if there is a hard keyboard
This commit is contained in:
satok
2011-01-20 18:28:15 -08:00
committed by Android Git Automerger

View File

@@ -210,7 +210,7 @@ public class InputMethodConfig extends SettingsPreferenceFragment {
chkbxPref.setTitle(label);
keyboardSettingsCategory.addPreference(chkbxPref);
// Disable the toggle if it's the only keyboard in the system, or it's a system IME.
if (!mHaveHardKeyboard && (imiSize <= 1 || isSystemIME)) {
if (imiSize <= 1 || isSystemIME) {
chkbxPref.setEnabled(false);
}