nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am d549d433: Merge "Remove long press settings key function" 

* commit 'd549d4334f05737128061a595a0a3304b1af00b6':
  Remove long press settings key function
main
Tadashi G. Takaoka 2011-12-15 10:08:32 -08:00 committed by Android Git Automerger
parent 6140e326d7 d549d4334f
commit 5e58cd999c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View File

@ -409,20 +409,17 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
invokeReleaseKey(primaryCode); invokeReleaseKey(primaryCode);
return true; return true;
} }
} if (primaryCode == Keyboard.CODE_SPACE) {
if (primaryCode == Keyboard.CODE_SETTINGS || primaryCode == Keyboard.CODE_SPACE) { // Long pressing the space key invokes IME switcher dialog.
// Both long pressing settings key and space key invoke IME switcher dialog.
if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) { if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) {
tracker.onLongPressed(); tracker.onLongPressed();
invokeReleaseKey(primaryCode); invokeReleaseKey(primaryCode);
return true; return true;
} else {
return openMoreKeysPanel(parentKey, tracker);
} }
} else {
return openMoreKeysPanel(parentKey, tracker);
} }
} }
return openMoreKeysPanel(parentKey, tracker);
}
private boolean invokeCustomRequest(int code) { private boolean invokeCustomRequest(int code) {
return getKeyboardActionListener().onCustomRequest(code); return getKeyboardActionListener().onCustomRequest(code);