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

* commit 'af7b6cab5ae91ad5fdd8985fda34c622d3118e6d':
  Disable the checkbox even if there is a hard keyboard
This commit is contained in:
satok
2011-01-21 10:56:26 -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);
}