commit c9bd848b11c126642ec20c67cc03908f1f445bec
author Uriel Rodriguez <urodriguez@google.com> Thu May 31 08:44:09 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 31 08:44:09 2012 -0700
tree abd931b51b24f57e1e9eb43979813b6683edb11f
parent 15065213620da656c210f356c1111e7382f5be73
parent 5c489be89cad070cefc04e9b59f84a0b9d1a26ec

Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev

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

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index d848503..bc8b458 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -407,8 +407,7 @@
                 InputDevice device = InputDevice.getDevice(devices[i]);
                 if (device != null
                         && !device.isVirtual()
-                        && (device.getSources() & InputDevice.SOURCE_KEYBOARD) != 0
-                        && device.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+                        && device.isFullKeyboard()) {
                     final String inputDeviceDescriptor = device.getDescriptor();
                     final String keyboardLayoutDescriptor =
                             mIm.getCurrentKeyboardLayoutForInputDevice(inputDeviceDescriptor);

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

diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index c736b2f5..f555d21 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -53,6 +53,7 @@
     private final InputMethodManager mImm;
     private final Intent mSettingsIntent;
     private final boolean mAlwaysChecked;
+    private final boolean mIsSystemIme;
 
     private AlertDialog mDialog = null;
     private ImageView mInputMethodSettingsButton;
@@ -69,7 +70,7 @@
             if (isChecked()) {
                 setChecked(false, true /* save */);
             } else {
-                if (mAlwaysChecked) {
+                if (mIsSystemIme) {
                     setChecked(true, true /* save */);
                 } else {
                     showSecurityWarnDialog(mImi, InputMethodPreference.this);
@@ -90,6 +91,7 @@
         updateSummary();
         mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
                 imi, fragment.getActivity(), imiCount);
+        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
         if (mAlwaysChecked) {
             setEnabled(false);
         }