diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-15 10:08:32 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 10:08:32 -0800 |
| commit | 5e58cd999c23af74458bef76fee01bcfcdece6b1 (patch) | |
| tree | e6c9d9c9d2792ac3b3d70fabb72d70e6635739a9 /java/src | |
| parent | 6140e326d7cb42e7306a8f578de9c41b210aec2c (diff) | |
| parent | d549d4334f05737128061a595a0a3304b1af00b6 (diff) | |
| download | latinime-5e58cd999c23af74458bef76fee01bcfcdece6b1.tar.gz latinime-5e58cd999c23af74458bef76fee01bcfcdece6b1.tar.xz latinime-5e58cd999c23af74458bef76fee01bcfcdece6b1.zip | |
am d549d433: Merge "Remove long press settings key function"
* commit 'd549d4334f05737128061a595a0a3304b1af00b6':
Remove long press settings key function
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index af5f808fd..e56f2ea84 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -409,19 +409,16 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke invokeReleaseKey(primaryCode); return true; } - } - if (primaryCode == Keyboard.CODE_SETTINGS || primaryCode == Keyboard.CODE_SPACE) { - // Both long pressing settings key and space key invoke IME switcher dialog. - if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) { - tracker.onLongPressed(); - invokeReleaseKey(primaryCode); - return true; - } else { - return openMoreKeysPanel(parentKey, tracker); + if (primaryCode == Keyboard.CODE_SPACE) { + // Long pressing the space key invokes IME switcher dialog. + if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) { + tracker.onLongPressed(); + invokeReleaseKey(primaryCode); + return true; + } } - } else { - return openMoreKeysPanel(parentKey, tracker); } + return openMoreKeysPanel(parentKey, tracker); } private boolean invokeCustomRequest(int code) { |