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

am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures 

* commit '2631fe4c4ea2135ae439381bd62d7c94b99b0e45':
  Honor automatic shift turned off for gestures
main
Jean Chalard 2012-10-16 17:25:58 -07:00 committed by Android Git Automerger
parent fd04a7abe7 2631fe4c4e
commit 60211f0d25
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -389,7 +389,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
} }
} }
public int getManualCapsMode() { public int getKeyboardShiftMode() {
final Keyboard keyboard = getKeyboard(); final Keyboard keyboard = getKeyboard();
if (keyboard == null) { if (keyboard == null) {
return WordComposer.CAPS_MODE_OFF; return WordComposer.CAPS_MODE_OFF;
@ -400,6 +400,8 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
return WordComposer.CAPS_MODE_MANUAL_SHIFT_LOCKED; return WordComposer.CAPS_MODE_MANUAL_SHIFT_LOCKED;
case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED: case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:
return WordComposer.CAPS_MODE_MANUAL_SHIFTED; return WordComposer.CAPS_MODE_MANUAL_SHIFTED;
case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:
return WordComposer.CAPS_MODE_AUTO_SHIFTED;
default: default:
return WordComposer.CAPS_MODE_OFF; return WordComposer.CAPS_MODE_OFF;
} }

4
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -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. // Factor in auto-caps and manual caps and compute the current caps mode.
private int getActualCapsMode() { private int getActualCapsMode() {
final int manual = mKeyboardSwitcher.getManualCapsMode(); final int keyboardShiftMode = mKeyboardSwitcher.getKeyboardShiftMode();
if (manual != WordComposer.CAPS_MODE_OFF) return manual; if (keyboardShiftMode != WordComposer.CAPS_MODE_AUTO_SHIFTED) return keyboardShiftMode;
final int auto = getCurrentAutoCapsState(); final int auto = getCurrentAutoCapsState();
if (0 != (auto & TextUtils.CAP_MODE_CHARACTERS)) { if (0 != (auto & TextUtils.CAP_MODE_CHARACTERS)) {
return WordComposer.CAPS_MODE_AUTO_SHIFT_LOCKED; return WordComposer.CAPS_MODE_AUTO_SHIFT_LOCKED;