diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-04-08 02:00:09 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-04-08 02:00:09 -0700 |
| commit | b428e8cc9eaed21ca1feaf1c07feaadff07ae338 (patch) | |
| tree | 5986992f014c9f55f4fbbd47dc653ee2f16c5fc2 /java/src | |
| parent | 299e366bcf70a19dfc3a4c4547041e816a5029a6 (diff) | |
| parent | 967d6073bfd5f3d0e21512754d78d2e87c958e27 (diff) | |
| download | latinime-b428e8cc9eaed21ca1feaf1c07feaadff07ae338.tar.gz latinime-b428e8cc9eaed21ca1feaf1c07feaadff07ae338.tar.xz latinime-b428e8cc9eaed21ca1feaf1c07feaadff07ae338.zip | |
Merge "Disable popup preview and long press on disabled key"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index f578bd613..59c132e91 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -379,7 +379,7 @@ public class Key { * @see android.graphics.drawable.StateListDrawable#setState(int[]) */ public int[] getCurrentDrawableState() { - final boolean pressed = mEnabled && mPressed; + final boolean pressed = mPressed; if (!mSticky && mFunctional) { if (pressed) { return KEY_STATE_FUNCTIONAL_PRESSED; diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index c28197014..eb5335ffd 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -546,6 +546,9 @@ public class PointerTracker { } private void showKeyPreviewAndUpdateKeyGraphics(int keyIndex) { + final Key key = getKey(keyIndex); + if (key != null && !key.mEnabled) + return; updateKeyGraphics(keyIndex); // The modifier key, such as shift key, should not be shown as preview when multi-touch is // supported. On the other hand, if multi-touch is not supported, the modifier key should @@ -565,6 +568,8 @@ public class PointerTracker { return; } Key key = getKey(keyIndex); + if (!key.mEnabled) + return; if (key.mCode == Keyboard.CODE_SHIFT) { mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this); } else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY |