aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-12-14 15:20:52 +0900
committerTadashi G. Takaoka <takaoka@google.com>2011-12-14 19:47:17 +0900
commit17dc10724bf0db04d0a4bfb2b8be0739ad9e60c6 (patch)
tree91c2603cb24fa9ad01bb1390589bc22a1c727800 /java/src
parente35e13fc7dc046be7f605cbfc706678f57e40491 (diff)
downloadlatinime-17dc10724bf0db04d0a4bfb2b8be0739ad9e60c6.tar.gz
latinime-17dc10724bf0db04d0a4bfb2b8be0739ad9e60c6.tar.xz
latinime-17dc10724bf0db04d0a4bfb2b8be0739ad9e60c6.zip
Remove long press settings key function
Bug: 5759092 Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java19
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) {