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

This commit is contained in:
satok
2011-01-20 18:25:15 -08:00
committed by Android (Google) Code Review

View File

@@ -210,7 +210,7 @@ public class InputMethodConfig extends SettingsPreferenceFragment {
chkbxPref.setTitle(label); chkbxPref.setTitle(label);
keyboardSettingsCategory.addPreference(chkbxPref); keyboardSettingsCategory.addPreference(chkbxPref);
// Disable the toggle if it's the only keyboard in the system, or it's a system IME. // 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); chkbxPref.setEnabled(false);
} }