diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-10-17 05:21:52 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-10-17 05:41:06 +0900 |
| commit | 6686e63f2158eff07e39ff002ba211d0578f2a4f (patch) | |
| tree | 5612f114bd6de7d05345f65683848e45edc8dacc /java/src/com/android/inputmethod/latin | |
| parent | c1bcb8ee104fd256cfda2d11b38336c9b3b3a0d3 (diff) | |
| download | latinime-6686e63f2158eff07e39ff002ba211d0578f2a4f.tar.gz latinime-6686e63f2158eff07e39ff002ba211d0578f2a4f.tar.xz latinime-6686e63f2158eff07e39ff002ba211d0578f2a4f.zip | |
Honor automatic shift turned off for gestures
Bug: 7354129
Change-Id: Ia02336e8cea2f04b629edbe74b7815cce0d7fad6
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -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; |