diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-01 04:44:02 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-01 04:44:02 -0700 |
| commit | b21d16704510be3c50e1d6ed9af22ae2cc96ce8a (patch) | |
| tree | 42a4eeb5b051607fc4b0fcd859d9bfbffcca8550 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 09192913fcf3dbe4fdd76f26c47e669788fc12fe (diff) | |
| parent | 76d6673b2aa7b7ae0511169e4cc576b7c51440ac (diff) | |
| download | latinime-b21d16704510be3c50e1d6ed9af22ae2cc96ce8a.tar.gz latinime-b21d16704510be3c50e1d6ed9af22ae2cc96ce8a.tar.xz latinime-b21d16704510be3c50e1d6ed9af22ae2cc96ce8a.zip | |
am 76d6673b: Merge "Fix checking if subtype belongs to this ime" into jb-dev
* commit '76d6673b2aa7b7ae0511169e4cc576b7c51440ac':
Fix checking if subtype belongs to this ime
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index c6381180c..7efdef987 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1148,8 +1148,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final IBinder token = getWindow().getWindow().getAttributes().token; if (mShouldSwitchToLastSubtype) { final InputMethodSubtype lastSubtype = mImm.getLastInputMethodSubtype(); - final boolean lastSubtypeBelongsToThisIme = ImfUtils.checkIfSubtypeBelongsToThisIme( - this, lastSubtype); + final boolean lastSubtypeBelongsToThisIme = + ImfUtils.checkIfSubtypeBelongsToThisImeAndEnabled(this, lastSubtype); if ((includesOtherImes || lastSubtypeBelongsToThisIme) && mImm.switchToLastInputMethod(token)) { mShouldSwitchToLastSubtype = false; |