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

Merge "Avoid calling switchToLastInputMethod when other IMEs are in effect"

main
Tadashi G. Takaoka 2012-10-02 01:36:37 -07:00 committed by Android (Google) Code Review
parent fe3fb2502d aec5cc8476
commit c3aea8ea9f
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 */);
} }
} }