diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-01 04:23:40 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-05-01 04:23:40 -0700 |
| commit | 76d6673b2aa7b7ae0511169e4cc576b7c51440ac (patch) | |
| tree | 42a4eeb5b051607fc4b0fcd859d9bfbffcca8550 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | aec1770ed143b486be6df0d4ee0ea5ac7f2b0e22 (diff) | |
| parent | ae2388c7f799ab565f63d3ba83abaf3300475fd0 (diff) | |
| download | latinime-76d6673b2aa7b7ae0511169e4cc576b7c51440ac.tar.gz latinime-76d6673b2aa7b7ae0511169e4cc576b7c51440ac.tar.xz latinime-76d6673b2aa7b7ae0511169e4cc576b7c51440ac.zip | |
Merge "Fix checking if subtype belongs to this ime" into jb-dev
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; |