commit f2d812a5d49af75ff796377a23048900f9eef11f
author satok <satok@google.com> Thu Jan 20 18:25:15 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 20 18:25:15 2011 -0800
tree 99340b4531c54a996f466a5375aea2d90f3367de
parent ca2870f3734a086a8d9a1551af6ecbe8d4828b1f
parent c080c0488e739c8ea61f72f2982590a445a687f5

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

src/com/android/settings/inputmethod/InputMethodConfig.java

diff --git a/src/com/android/settings/inputmethod/InputMethodConfig.java b/src/com/android/settings/inputmethod/InputMethodConfig.java
index 22d4411..3e77ba1 100644
--- a/src/com/android/settings/inputmethod/InputMethodConfig.java
+++ b/src/com/android/settings/inputmethod/InputMethodConfig.java
@@ -210,7 +210,7 @@
         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);
         }