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
commit 5e58cd999c
1 changed files with 8 additions and 11 deletions

View File

@ -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) {