aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-12-15 10:08:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-15 10:08:29 -0800
commitbe6d5a041c175d4ae1563c44ef95863470f6acfa (patch)
treee90a668e8e8b55f9ede5835286d78a9639a9d686 /java/src/com/android
parente3297a79ffc2728bdc527669c6ba817c4202482e (diff)
parenta042150a697715ca0b65fcc1a03fcc3491c488a2 (diff)
downloadlatinime-be6d5a041c175d4ae1563c44ef95863470f6acfa.tar.gz
latinime-be6d5a041c175d4ae1563c44ef95863470f6acfa.tar.xz
latinime-be6d5a041c175d4ae1563c44ef95863470f6acfa.zip
am a042150a: Merge "Just ignore settings/shortcut key while typing on tablet"
* commit 'a042150a697715ca0b65fcc1a03fcc3491c488a2': Just ignore settings/shortcut key while typing on tablet
Diffstat (limited to 'java/src/com/android')
-rw-r--r--java/src/com/android/inputmethod/keyboard/Keyboard.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index e267aa65c..e3f219162 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -151,6 +151,9 @@ public class Keyboard {
}
public Key getKey(int code) {
+ if (code == CODE_DUMMY) {
+ return null;
+ }
final Integer keyCode = code;
if (mKeyCache.containsKey(keyCode)) {
return mKeyCache.get(keyCode);