commit caaa850ffb143edd827cf2a9b9e49b37e9aa777d
author Jeff Brown <jeffbrown@google.com> Wed May 30 15:00:50 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 15:00:50 2012 -0700
tree 362059c32c5f1a2ad7a5dcca07cba195e3aa8ae4
parent a2d55407317b50f86069f9e9feb6a0478ee3b1f9
parent bf677f48b73fc8d6fea9f09ad9d0e423f982d260

Merge "Fix comparison of device source bits." 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);