diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-08-26 23:54:29 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-08-26 23:54:29 -0700 |
| commit | 7986d78328e17bdbe7ec05558e93a2c6a25641c6 (patch) | |
| tree | 810409d496d54098b2750fa9a50f9f0659fb3850 /java/src | |
| parent | f17a50f5a5a6c185d3a223bea3a7475c8482a110 (diff) | |
| parent | cec1495071e0cf78b5941b07768062fbafe2dccd (diff) | |
| download | latinime-7986d78328e17bdbe7ec05558e93a2c6a25641c6.tar.gz latinime-7986d78328e17bdbe7ec05558e93a2c6a25641c6.tar.xz latinime-7986d78328e17bdbe7ec05558e93a2c6a25641c6.zip | |
Merge "Disable long-press on shift and symbol keys" into gingerbread
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboardView.java | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 2753bb8b9..37ae43d38 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1103,9 +1103,6 @@ public class LatinIME extends InputMethodService case LatinKeyboardView.KEYCODE_PREV_LANGUAGE: toggleLanguage(false, false); break; - case LatinKeyboardView.KEYCODE_SHIFT_LONGPRESS: - handleCapsLock(); - break; case Keyboard.KEYCODE_MODE_CHANGE: changeKeyboardMode(); break; diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java index e57abd2c5..cca0de18e 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java @@ -34,7 +34,6 @@ import android.widget.PopupWindow; public class LatinKeyboardView extends LatinKeyboardBaseView { static final int KEYCODE_OPTIONS = -100; - static final int KEYCODE_SHIFT_LONGPRESS = -101; static final int KEYCODE_VOICE = -102; static final int KEYCODE_F1 = -103; static final int KEYCODE_NEXT_LANGUAGE = -104; @@ -95,18 +94,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView { @Override protected boolean onLongPress(Key key) { - if (key.codes[0] == Keyboard.KEYCODE_MODE_CHANGE) { - getOnKeyboardActionListener().onKey(KEYCODE_OPTIONS, null, - LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE, - LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE); - return true; - } else if (key.codes[0] == Keyboard.KEYCODE_SHIFT) { - getOnKeyboardActionListener().onKey(KEYCODE_SHIFT_LONGPRESS, null, - LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE, - LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE); - invalidateAllKeys(); - return true; - } else if (key.codes[0] == '0' && getKeyboard() == mPhoneKeyboard) { + if (key.codes[0] == '0' && getKeyboard() == mPhoneKeyboard) { // Long pressing on 0 in phone number keypad gives you a '+'. getOnKeyboardActionListener().onKey( '+', null, LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE, |