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

am 792980d4: Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)

Browse source 
* commit '792980d4aa4d0d91a5acfcbaba3f4471f1d2c073':
  Avoid calling switchToLastInputMethod when other IMEs are in effect (DO NOT MERGE)
This commit is contained in:
Tadashi G. Takaoka 2012-10-07 09:02:09 -07:00 committed by Android Git Automerger
commit c0a5f07c9b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1219,22 +1219,25 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mConnection.performEditorAction(actionId); mConnection.performEditorAction(actionId);
} }
// TODO: Revise the language switch key behavior to make it much smarter and more reasonable.
private void handleLanguageSwitchKey() { private void handleLanguageSwitchKey() {
final boolean includesOtherImes = mCurrentSettings.mIncludesOtherImesInLanguageSwitchList;
final IBinder token = getWindow().getWindow().getAttributes().token; final IBinder token = getWindow().getWindow().getAttributes().token;
if (mCurrentSettings.mIncludesOtherImesInLanguageSwitchList) {
mImm.switchToNextInputMethod(token, false /* onlyCurrentIme */);
return;
}
if (mShouldSwitchToLastSubtype) { if (mShouldSwitchToLastSubtype) {
final InputMethodSubtype lastSubtype = mImm.getLastInputMethodSubtype(); final InputMethodSubtype lastSubtype = mImm.getLastInputMethodSubtype();
final boolean lastSubtypeBelongsToThisIme = final boolean lastSubtypeBelongsToThisIme =
ImfUtils.checkIfSubtypeBelongsToThisImeAndEnabled(this, lastSubtype); ImfUtils.checkIfSubtypeBelongsToThisImeAndEnabled(this, lastSubtype);
if ((includesOtherImes || lastSubtypeBelongsToThisIme) if (lastSubtypeBelongsToThisIme && mImm.switchToLastInputMethod(token)) {
&& mImm.switchToLastInputMethod(token)) {
mShouldSwitchToLastSubtype = false; mShouldSwitchToLastSubtype = false;
} else { } else {
mImm.switchToNextInputMethod(token, !includesOtherImes); mImm.switchToNextInputMethod(token, true /* onlyCurrentIme */);
mShouldSwitchToLastSubtype = true; mShouldSwitchToLastSubtype = true;
} }
} else { } else {
mImm.switchToNextInputMethod(token, !includesOtherImes); mImm.switchToNextInputMethod(token, true /* onlyCurrentIme */);
} }
} }