diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-10-16 17:25:58 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 17:25:58 -0700 |
| commit | 60211f0d250ca931788d32d5a69c880f75ef7d49 (patch) | |
| tree | 5612f114bd6de7d05345f65683848e45edc8dacc /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | fd04a7abe7722be94c84e24dc71a2b695e3ddafc (diff) | |
| parent | 2631fe4c4ea2135ae439381bd62d7c94b99b0e45 (diff) | |
| download | latinime-60211f0d250ca931788d32d5a69c880f75ef7d49.tar.gz latinime-60211f0d250ca931788d32d5a69c880f75ef7d49.tar.xz latinime-60211f0d250ca931788d32d5a69c880f75ef7d49.zip | |
am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
* commit '2631fe4c4ea2135ae439381bd62d7c94b99b0e45':
Honor automatic shift turned off for gestures
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 d98966e96..cd20ba3a3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1119,8 +1119,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction // Factor in auto-caps and manual caps and compute the current caps mode. private int getActualCapsMode() { - final int manual = mKeyboardSwitcher.getManualCapsMode(); - if (manual != WordComposer.CAPS_MODE_OFF) return manual; + final int keyboardShiftMode = mKeyboardSwitcher.getKeyboardShiftMode(); + if (keyboardShiftMode != WordComposer.CAPS_MODE_AUTO_SHIFTED) return keyboardShiftMode; final int auto = getCurrentAutoCapsState(); if (0 != (auto & TextUtils.CAP_MODE_CHARACTERS)) { return WordComposer.CAPS_MODE_AUTO_SHIFT_LOCKED; |